Commit Graph

35921 Commits

Author SHA1 Message Date
Robert Ly
5292656c7a am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'd1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:51:08 -07:00
Robert Ly
f5b9121091 am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '152e5f56762c9db80d2b65fda8b13e3914f05d86':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:50:39 -07:00
Robert Ly
20d6fbd94c am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'c7c1ba5071456a813abbdadfdbe94287b06877e7':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:44:59 -07:00
Robert Ly
b41a023a5c am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '329e0b9020f3b8cd1265c265cdf00b438960cbe1':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:44:55 -07:00
Robert Ly
9fcc542657 Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-20 09:37:51 -07:00
Robert Ly
d02950e3a0 Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-20 09:37:36 -07:00
Jean-Baptiste Queru
0f0f4960f8 am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"
* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility
2011-06-20 09:14:31 -07:00
Jean-Baptiste Queru
75e3e4936b am e3b05d09: Merge "Tweaks for forward-compatibility"
* commit 'e3b05d09163257b888c86f2a560e10c48f4cf029':
  Tweaks for forward-compatibility
2011-06-20 09:05:07 -07:00
Glenn Kasten
d80fa1aa39 Merge "Remove unneeded #include <sys/resource.h>" 2011-06-20 07:47:51 -07:00
Jeff Sharkey
8c801ba2fe Merge "Teach NetworkIdentity about roaming." 2011-06-19 22:24:49 -07:00
Jeff Sharkey
29b1024bae Merge "Persist "tagged" network stats along with UIDs." 2011-06-19 22:07:41 -07:00
Jeff Sharkey
1c3babf3bb Merge "Handle removed UIDs in network stats and policy." 2011-06-19 01:12:01 -07:00
Jeff Sharkey
cb1e06c940 Merge "Read "qtaguid" network stats, refactor templates." 2011-06-18 23:19:38 -07:00
Jean-Baptiste Queru
101d6fc4aa Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
3f3f5af40e Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
2011-06-18 09:42:04 -07:00
Adam Powell
474feb8703 Merge "Holo dialog formatting" 2011-06-17 21:41:08 -07:00
Mike Lockwood
84957d7a13 Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands" 2011-06-17 20:54:53 -07:00
Mike Lockwood
63030e69c9 Merge "USB connected notification and temporary USB options dialog" 2011-06-17 20:54:38 -07:00
Mike Lockwood
7bff02e860 Merge "MountService: Use UsbManager to monitor USB state for mass storage" 2011-06-17 20:54:16 -07:00
Mike Lockwood
3dff247c31 Merge "USB: Support for new USB gadget drivers" 2011-06-17 20:54:00 -07:00
Adam Powell
f541ac0bbf Merge "Allow the action bar title to take on the role of "up" in the absence of a standard "home" icon." 2011-06-17 20:32:49 -07:00
Jim Miller
54e0d4fe99 Merge "Fix 4584957: remove owner info from phone layouts" 2011-06-17 20:10:20 -07:00
Jim Miller
a32156124e Merge "Temporary workaround for conflict in GridLayout/LockScreen." 2011-06-17 19:55:55 -07:00
Jim Miller
806f006408 Merge "Handle dropped motion events in Pattern Unlock due to high system activity" 2011-06-17 19:39:49 -07:00
Romain Guy
93de639cb1 Merge "Add error checking to LayerRenderer::copyLayer" 2011-06-17 17:47:59 -07:00
Jeff Sharkey
f714bb8329 Merge "Notify policy listeners about metered ifaces." 2011-06-17 16:57:28 -07:00
Jim Miller
b476f3aee3 Merge "Update pattern unlock and assets to match new UX design spec." 2011-06-17 16:50:34 -07:00
Mike Lockwood
8af30cbd56 Merge "Add string resource for CD installer image path" 2011-06-17 16:50:10 -07:00
Chia-chi Yeh
0b85252cf2 Merge "VPN: avoid leaking file descriptors." 2011-06-17 16:43:44 -07:00
Adam Powell
af6d64d3a8 Merge "Fix bug 4689431 - PopupMenus too narrow on phones" 2011-06-17 16:03:40 -07:00
Chet Haase
e7cd658237 Merge "Invisible views can't start animations" 2011-06-17 16:00:57 -07:00
James Dong
3d31ec0cec Merge "Use system property to control whether we will enable B frame support in MPEG4Writer" 2011-06-17 15:50:19 -07:00
Romain Guy
b712c809d9 Merge "Fix rendering issue with paths when the stroke width is 0" 2011-06-17 15:49:22 -07:00
Philip Milne
21be7f5623 Merge "Pass width/height specs in the standard way when measuring children." 2011-06-17 15:43:13 -07:00
Chia-chi Yeh
75f1a69323 Merge "VpnDialogs: migrate to VpnConfig." 2011-06-17 15:31:54 -07:00
RoboErik
37b01ee007 Merge "Fix typo in docs link" 2011-06-17 15:28:13 -07:00
Elliott Hughes
3f5021ab9b Merge "Make debuggable="true" imply CheckJNI." 2011-06-17 15:14:28 -07:00
Dianne Hackborn
d83ccdb12f Merge "Implement remaining infrastructure for user disabling apps." 2011-06-17 14:53:10 -07:00
RoboErik
2b9481e8b8 Merge "Add docs for Calendars table" 2011-06-17 14:41:38 -07:00
Chia-chi Yeh
88826e6f4e Merge "VPN: move VpnDialogs related methods into VpnConfig." 2011-06-17 14:37:11 -07:00
Daisuke Miyakawa
8540094985 Merge "Remove HanziToPinin.java" 2011-06-17 14:36:42 -07:00
Adam Powell
17b51e1771 Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState" 2011-06-17 14:32:23 -07:00
Amith Yamasani
f3410ad0d8 Merge "Inform the InputMethodManager that a focused view has been attached." 2011-06-17 14:29:17 -07:00
Eric Laurent
e628bb1501 Merge "Fix regression in audio effect factory" 2011-06-17 14:05:31 -07:00
Adam Powell
e147fda821 Merge "Create theme attributes for small and large listPreferredItemHeight. Change default holo dialog list items to use them." 2011-06-17 13:57:07 -07:00
Stephen Hines
5a7340a395 Merge "POSITVE -> POSITIVE typo fix" 2011-06-17 13:53:20 -07:00
Stephen Hines
b67ff18d5e Merge "Add isCompatible() to RS Element." 2011-06-17 13:52:44 -07:00
David Brown
5379f294a2 Merge "Fix permissions check in IccSmsInterfaceManager.sendText()" 2011-06-17 13:15:24 -07:00
Daisuke Miyakawa
0710d4648f Merge "Add API for auto-complete ranking improvement." 2011-06-17 13:10:40 -07:00
John Reck
772eb91ede Merge "Make textZoom public" 2011-06-17 13:05:56 -07:00