Michael Jurka
39188d61e7
Merge "Dismiss Recent Apps when Back is pressed"
2011-07-28 13:24:14 -07:00
Mike Lockwood
956ddf5604
am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:23:01 -07:00
Mike Lockwood
a9b8a0640e
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
2011-07-28 13:13:35 -07:00
Ben Murdoch
ce65b48cf1
Merge "Revert "Disable Crankshaft in DRT for performance testing.""
2011-07-28 13:10:38 -07:00
Svetoslav Ganov
159e39f7e8
Merge "Updating the data base upgrade/creation code for the new touch exploraion setting."
2011-07-28 12:29:29 -07:00
Adam Powell
1ae9e7db06
Merge "Fix bug 5087752 - Maintain correct contrast against action bars in inverse-bar themes"
2011-07-28 11:58:21 -07:00
Svetoslav Ganov
aaf53a77a2
Merge "AccessibilityNodeInfo reports no children for the topmost view in the tree."
2011-07-28 11:09:43 -07:00
Justin Ho
a914991afd
Merge "Updated expander assets"
2011-07-28 10:39:36 -07:00
Adam Powell
72929bed74
Merge "Fix bug 5087980 - MenuItem#expandActionView should work from within onCreateOptionsMenu"
2011-07-28 10:02:14 -07:00
Kristian Monsen
74bba4e8c3
Merge "Part of fix for bug 4997380: Some error types unknown to SslError"
2011-07-28 06:50:40 -07:00
Jeff Sharkey
13fbd9a9a2
Merge "Maintain separate "restrict background data" flag."
2011-07-27 22:08:02 -07:00
Wink Saville
6da562d9d9
am 5ad5c9e3: am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
...
* commit '5ad5c9e3efd26155ae7b5d0f3e9e2094e1f65dfe':
Support of LTE Only mode
2011-07-27 20:41:23 -07:00
Wink Saville
a6e07f0018
am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
...
* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
Support of LTE Only mode
2011-07-27 20:39:09 -07:00
Wink Saville
922649c544
Merge "Support of LTE Only mode" into honeycomb-LTE
2011-07-27 20:35:52 -07:00
Romain Guy
4a01cfcdcf
Merge "Reclaim more memory, more often."
2011-07-27 18:53:32 -07:00
Xavier Ducrohet
c01663e2be
am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
Remove Debug Code
2011-07-27 18:43:32 -07:00
Xavier Ducrohet
a5afd4fdd9
am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
Remove Debug Code
2011-07-27 18:40:49 -07:00
Xavier Ducrohet
126c631581
am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
Remove Debug Code
2011-07-27 18:38:50 -07:00
Xavier Ducrohet
7fa726e769
am 20339b24: Merge "Remove Debug Code"
...
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
2011-07-27 18:36:17 -07:00
Chia-chi Yeh
09aa572bdb
Merge "Unhide APIs for user space VPN."
2011-07-27 18:35:51 -07:00
Ying Wang
e993c420d0
Merge "Fix uses of all-subdir-makefiles"
2011-07-27 18:29:26 -07:00
Xavier Ducrohet
eff4cc7766
Merge "Remove Debug Code"
2011-07-27 18:26:01 -07:00
Jeff Sharkey
a0c2fecd63
Merge "Grant AID_NET_BW_STATS to system service."
2011-07-27 18:09:42 -07:00
Ying Wang
0a1fdd7d50
Fix uses of all-subdir-makefiles
...
We should use all-makefiles-under instead.
all-subdir-makefiles can be used only before any "include" statement.
Before this change, both subdirs were actually not included.
Change-Id: I6bf35d07f294a5012c9322096f999ac26e37432f
2011-07-27 16:59:08 -07:00
Gilles Debunne
6bd7668351
Merge "Bug 4571327: error popup empty when displayed on top"
2011-07-27 16:47:26 -07:00
Daniel Sandler
a36f16f712
Merge "Restore status icons to former size & opacity on tablets."
2011-07-27 16:36:11 -07:00
Ramesh Sudini
7c29339919
am 8ce53e38: am 9a87deb5: DataConnection: Clear cid when entering inactive state.
...
* commit '8ce53e387e2b4427265ae9e43bc15d9fe850643d':
DataConnection: Clear cid when entering inactive state.
2011-07-27 16:35:41 -07:00
Ramesh Sudini
30060f6c76
am 9a87deb5: DataConnection: Clear cid when entering inactive state.
...
* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
DataConnection: Clear cid when entering inactive state.
2011-07-27 16:32:48 -07:00
Romain Guy
fa351036dc
Merge "Destroy layers and flush layers cache when a window is destroyed."
2011-07-27 16:31:19 -07:00
Irfan Sheriff
479d354fe9
Merge "Will not disable wifi on wifi-only devices."
2011-07-27 16:09:18 -07:00
Jeff Brown
17ae3e9bdf
Merge "Reset input dispatcher targets when focus changes apps."
2011-07-27 15:54:57 -07:00
Kenny Root
b313559b21
Merge "Move extract native libraries to JNI code"
2011-07-27 15:54:51 -07:00
Jeff Brown
c9122a775e
Merge "Report the external display size to the input reader."
2011-07-27 15:54:50 -07:00
Jeff Brown
566da2f60b
Merge "Handle stylus buttons and tool types."
2011-07-27 15:54:41 -07:00
Kenny Root
c433b283ca
Merge "Change ZipFile flags anonymous enum"
2011-07-27 15:54:39 -07:00
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