Jeff Brown
|
4d5acb08f5
|
Merge "Drop hack for drivers that emit zero ABS_MT_TOUCH_MAJOR. Bug: 5064702"
|
2011-07-27 15:54:35 -07:00 |
|
Jeff Sharkey
|
22f3e840ff
|
Merge "Revise data limit notifs, watch kernel alerts."
|
2011-07-27 15:52:24 -07:00 |
|
Mike Lockwood
|
e8097a66c8
|
Merge "UsbDeviceManager: Don't show USB notification for RNDIS"
|
2011-07-27 15:49:05 -07:00 |
|
Adam Powell
|
f5b2a4dcd8
|
Merge "Bug 5076788 - Optimize the building and invalidation of menus"
|
2011-07-27 15:47:04 -07:00 |
|
Chris Craik
|
f857d5aa9f
|
Merge "Use WebTextView overlay to render text fields/areas much faster"
|
2011-07-27 15:46:44 -07:00 |
|
Svetoslav Ganov
|
cb42346cdd
|
Merge "Not user generated accessibility events can change the interrogation allowing window."
|
2011-07-27 15:24:10 -07:00 |
|
Glenn Kasten
|
e21e2d8dcd
|
Merge "Bug 4599730 Get audio channel count on MediaPlayer"
|
2011-07-27 14:45:28 -07:00 |
|
Irfan Sheriff
|
fc9d87d983
|
Merge "Run hostapd on a seperate thread"
|
2011-07-27 14:20:21 -07:00 |
|
Jason Sams
|
22357ee44a
|
Merge "Add const to matrix by vector multiply routines. Cleanup ifdef for rsForEach."
|
2011-07-27 14:19:58 -07:00 |
|
Xavier Ducrohet
|
3e81433375
|
am 64994077: (-s ours) am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '64994077347276fba4fe2eb1719c7dd2c2105073':
DO NOT MERGE. may fix build on some version of gcc
|
2011-07-27 14:08:27 -07:00 |
|
Xavier Ducrohet
|
fba44526c0
|
am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit 'c682559d3c39aa4503d5c4d60ae046393aa45b79':
DO NOT MERGE. may fix build on some version of gcc
|
2011-07-27 14:03:35 -07:00 |
|
Xavier Ducrohet
|
e32af36b39
|
am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
DO NOT MERGE. may fix build on some version of gcc
|
2011-07-27 14:01:23 -07:00 |
|
Xavier Ducrohet
|
44f57c061a
|
am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
|
2011-07-27 13:59:57 -07:00 |
|
Xavier Ducrohet
|
060c1a8f1a
|
Merge "DO NOT MERGE. may fix build on some version of gcc"
|
2011-07-27 13:45:05 -07:00 |
|
Scott Main
|
3254987a06
|
Merge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs: clarify framelayout class summary, issue 5055437"
|
2011-07-27 13:34:12 -07:00 |
|
Christopher Tate
|
ff43d97473
|
Merge "Don't actually try to stop processes marked 'persistent'"
|
2011-07-27 12:41:42 -07:00 |
|
Scott Main
|
5e655278de
|
Merge "cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782 docs: add documentation about market multiple apk support"
|
2011-07-27 12:35:48 -07:00 |
|
Scott Main
|
9f318aa5a3
|
Merge "cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e docs: clarify that the market app responds to http urls"
|
2011-07-27 12:34:24 -07:00 |
|
Scott Main
|
aba1a95155
|
Merge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs: resolve issue 5044273 and fix markup error"
|
2011-07-27 12:32:40 -07:00 |
|
Scott Main
|
dfdd69be2d
|
Merge "cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e docs: fix issue 5048214 and clarify some variable names"
|
2011-07-27 12:26:45 -07:00 |
|
Scott Main
|
c505c0ed2b
|
Merge "cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b update version code to 3.2 for docs footer"
|
2011-07-27 12:24:50 -07:00 |
|
Dianne Hackborn
|
88506947ed
|
Merge "Fix issue #4466531: onServiceConnected() not called after..."
|
2011-07-27 12:19:40 -07:00 |
|
Scott Main
|
82521e4151
|
Merge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix doc break"
|
2011-07-27 11:58:10 -07:00 |
|
Scott Main
|
fa854c3814
|
Merge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sdk build"
|
2011-07-27 11:58:01 -07:00 |
|
Scott Main
|
32edca5f98
|
Merge "cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c docs: add info to plural strings about using string formats"
|
2011-07-27 11:51:16 -07:00 |
|
Scott Main
|
3c2e78ad7d
|
Merge "cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01 docs: fix shapedrawable doc error issue 5030364"
|
2011-07-27 11:49:22 -07:00 |
|
Scott Main
|
46e9c78088
|
Merge "cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299 docs: add k-touch driver id"
|
2011-07-27 11:47:48 -07:00 |
|
Scott Main
|
a7e189ce30
|
Merge "cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299 docs: update Support Mult Screens for MR2 features"
|
2011-07-27 11:36:44 -07:00 |
|
Eric Laurent
|
5d6fe5d75e
|
Merge "Issue 3370834: No Echo canceler for SIP"
|
2011-07-27 11:34:36 -07:00 |
|
Guang Zhu
|
42d3aa9c02
|
Merge "Disable Crankshaft in DRT for performance testing."
|
2011-07-27 11:33:40 -07:00 |
|
Mathias Agopian
|
aa599086f8
|
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
|
2011-07-27 11:31:57 -07:00 |
|
Mike Lockwood
|
b0170ea066
|
Merge "Fix USB tethering again"
|
2011-07-27 11:05:10 -07:00 |
|
Amith Yamasani
|
19b27c67cc
|
Merge "Make sure that suggestions are queried on focus or tapping."
|
2011-07-27 10:54:15 -07:00 |
|
Amith Yamasani
|
ebfb8c1226
|
Merge "Handle callbacks to CollapsibleActionViews that are in an actionLayout."
|
2011-07-27 10:53:25 -07:00 |
|
The Android Open Source Project
|
119f2129fe
|
Reconcile with gingerbread-mr4-release
Change-Id: Ib13d4ae0889290a35357da01bf3acf140b89bd23
|
2011-07-27 10:42:40 -07:00 |
|
Bill Gruber
|
f188d438a8
|
Merge "Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f IAB docs: fixes and updates"
|
2011-07-27 10:29:57 -07:00 |
|
Bill Gruber
|
9bbbc3c0e4
|
Merge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07 sdk doc change: updated intro to developing and removed reference to G1 Bug: 4483863"
|
2011-07-27 10:29:47 -07:00 |
|
Robert Ly
|
3e5c770976
|
Merge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51"
|
2011-07-27 10:27:59 -07:00 |
|
Robert Ly
|
6df2a04012
|
Merge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4"
|
2011-07-27 10:27:53 -07:00 |
|
Robert Ly
|
4b45cabe6c
|
Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b"
|
2011-07-27 10:27:46 -07:00 |
|
Robert Ly
|
c5c0c00fb3
|
Merge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989"
|
2011-07-27 10:27:39 -07:00 |
|
Robert Ly
|
5063fce9c8
|
Merge "cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35cf60e"
|
2011-07-27 10:27:31 -07:00 |
|
Robert Greenwalt
|
5a27c720bb
|
Merge "resolved conflicts for merge of af75fdb1 to master"
|
2011-07-27 10:17:26 -07:00 |
|
Robert Greenwalt
|
682ee1c371
|
resolved conflicts for merge of af75fdb1 to master
Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129
|
2011-07-27 10:00:36 -07:00 |
|
Alex Sakhartchouk
|
14bf390692
|
Merge "Add getName to renderscript base object"
|
2011-07-27 09:50:35 -07:00 |
|
Eric Laurent
|
a8b70e97bd
|
Merge "AudioFlinger: fix crash when deleting pre process."
|
2011-07-27 09:48:47 -07:00 |
|
Jeff Sharkey
|
e4228635bb
|
Merge "Avoid sync when UID network is disconnected."
|
2011-07-27 09:41:39 -07:00 |
|
Gilles Debunne
|
116f8a1692
|
Merge "Bug 4987014: a tap outside dismisses the text suggestion popup"
|
2011-07-27 09:31:02 -07:00 |
|
Robert Greenwalt
|
5bf7250ab7
|
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
|
2011-07-27 09:27:00 -07:00 |
|
Eric Laurent
|
7128ffc56b
|
Merge "Fix issue 4604090: notification sound interrupted."
|
2011-07-27 09:02:47 -07:00 |
|