Commit Graph

38032 Commits

Author SHA1 Message Date
Xavier Ducrohet
de16a5a62b am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
  Fix String16 operator+ to actually work
2011-08-17 14:40:57 -07:00
Xavier Ducrohet
754b249bcd am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
  Fix String16 operator+ to actually work
2011-08-17 14:38:15 -07:00
Xavier Ducrohet
242915f3d0 am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work
2011-08-17 14:35:20 -07:00
Xavier Ducrohet
35302266fa am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
  Fix String16 operator+ to actually work
2011-08-17 14:31:08 -07:00
Xavier Ducrohet
9f4d9d148f Merge "Fix String16 operator+ to actually work" 2011-08-17 14:18:04 -07:00
Gilles Debunne
22cf25cba6 Merge "Fix bit comparison for checking the variant of the input type." 2011-08-17 14:03:56 -07:00
Eric Fischer
a05d2f5b74 Merge "Remove translations that contain mangled format strings." 2011-08-17 13:47:39 -07:00
Alex Sakhartchouk
9f6d58b773 Merge "Fixing asynchronous performance issues." 2011-08-17 13:29:24 -07:00
Andreas Huber
ca9adcac53 Merge "Make sure we have all the sample table metadata before declaring a track valid." 2011-08-17 13:21:40 -07:00
Claudia de Veaux
99e0a743f0 Merge "Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. Bugs: 5174094 and 5165745" 2011-08-17 12:52:04 -07:00
Mathias Agopian
3902be629b fix a small race condition when returning the default width/height of a SurfaceTexture
Change-Id: I581bf609505dfb5d4ec5957b2ef2c77df6cfb15f
2011-08-17 12:45:40 -07:00
Adam Cohen
3cff0866a2 Merge "Getting rid of the (hidden) oldName parameter for widgets" 2011-08-17 11:39:32 -07:00
Justin Ho
21d4505078 Merge "Updated day_picker Bug: 5076695" 2011-08-17 11:17:32 -07:00
James Dong
16e4a7ab41 Merge "Don't time out prematurely for video encoding waiting for output buffers" 2011-08-17 11:14:49 -07:00
Alon Albert
fd96ed248d Merge "Check for periodic sync that is in the future Bug: 5164762 Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1" 2011-08-17 10:34:35 -07:00
Eric Laurent
0454f26183 Merge "Change condition to enter silent mode." 2011-08-17 10:19:06 -07:00
Mathias Agopian
eb2f227faf Merge "as a debug option SrufaceFlinger can now connect to DDMS" 2011-08-17 09:58:33 -07:00
Joe Fernandez
d14ed8f9f9 Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials" 2011-08-17 09:31:45 -07:00
Justin Ho
5e5e311e29 Merge "New spinners Bug: 5165176" 2011-08-17 09:13:16 -07:00
Daniel Sandler
7d3d492a15 Merge "Remove longpress support from the software Home key." 2011-08-17 06:48:13 -07:00
Daniel Sandler
7f5e2c425b Merge "Breathing room between RSSI and battery on tablets." 2011-08-17 06:47:11 -07:00
Svetoslav Ganov
9f219a950b Merge "Breaks the build" 2011-08-17 05:27:07 -07:00
Chih-Chung Chang
b23bef1cb5 Merge "Display thumbnails one by one and cache them." 2011-08-17 04:41:33 -07:00
Svetoslav Ganov
fd7dc49bcd Merge "Adding accessibility support to the PIN lock screen." 2011-08-17 04:31:37 -07:00
Kristian Monsen
8afaea9f6c Merge "Fix for bug 3429537 Google voice (web version) does not play messages on HC" 2011-08-17 02:41:39 -07:00
Kristian Monsen
620d3efec8 Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2" 2011-08-17 02:41:00 -07:00
Ben Murdoch
9bf4770933 Merge "No need to pass an AssetManager to native when creating a WebView" 2011-08-17 02:28:52 -07:00
Dianne Hackborn
9ea82b2e91 am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '51beb81a8e901020293b7a30a68b405bca71d258':
  Handle stopping of services with still bound applications.
2011-08-16 20:47:39 -07:00
Dianne Hackborn
c9514d2dad am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
  Handle stopping of services with still bound applications.
2011-08-16 20:45:19 -07:00
Dianne Hackborn
bf046a8e05 am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
  Handle stopping of services with still bound applications.
2011-08-16 20:42:17 -07:00
Dianne Hackborn
e0233e99cd am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
  Handle stopping of services with still bound applications.
2011-08-16 20:39:50 -07:00
Dianne Hackborn
96fe23ed7b Merge "Handle stopping of services with still bound applications." 2011-08-16 19:29:25 -07:00
James Dong
d4ee2db4dd Merge "Use camcorder profiles for MediaRecorderStressTest" 2011-08-16 18:26:54 -07:00
Scott Main
b281d34035 Merge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update ndk requirements issue 5157542" 2011-08-16 18:26:34 -07:00
Fabrice Di Meglio
69814e5524 Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic" 2011-08-16 17:35:06 -07:00
Christopher Tate
cf71e12fe0 Merge "Don't crash if a drag recipient throws an uncaught exception" 2011-08-16 17:03:24 -07:00
Adam Powell
4737c83523 Merge "Fix bug 5048082 - Conversation doesn't scroll after you send a message" 2011-08-16 16:46:48 -07:00
Amith Yamasani
8b378522bd Merge "Rename an asset and update ic_commit_* drawables." 2011-08-16 16:45:13 -07:00
Amith Yamasani
adaa479b02 Merge "Move the padding to the text field in SearchView." 2011-08-16 16:19:56 -07:00
Erik Gilling
dccad537e0 Merge "Set rotation to landscape on HDMI instead of 0" 2011-08-16 15:57:24 -07:00
Adam Powell
455fafd1e3 Merge "Fix bug 5165771 - Gmail: crash on launch from notifier" 2011-08-16 15:24:51 -07:00
Josiah Gaskin
37bf88e547 Fix String16 operator+ to actually work
This change fixes the String16 utility's operator+ function.

Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
2011-08-16 15:16:04 -07:00
Huahui Wu
7a5890462c Merge "b/5080166 Enalbe multi-touch on external touch escreen." 2011-08-16 15:09:08 -07:00
Russell Brenner
a10243d43c Merge "Add Lohit-Hindi.ttf as a system fallback font" 2011-08-16 15:06:16 -07:00
repo sync
3e1eb7064f Merge "P2p enhancements" 2011-08-16 14:50:56 -07:00
Andreas Huber
d88053a1e2 Merge "Error handling in ACodec and Nuplayer." 2011-08-16 14:37:51 -07:00
Romain Guy
e6b684b2f3 Merge "Prevent NPE in HardwareRenderer Bug #5169815" 2011-08-16 14:30:50 -07:00
Chia-chi Yeh
83c5bfc7d7 Merge "VPN: reset legacy VPN when resetting IPv4 addresses." 2011-08-16 14:25:30 -07:00
Fred Quintana
6a175aea72 Merge "add the Identity contacts mimetype Bug: 5061729" 2011-08-16 14:19:59 -07:00
Mike Lockwood
fa8005fbb0 Merge "UsbManager: Use resource IDs for notification IDs" 2011-08-16 14:06:59 -07:00