- 98f2f33 am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE by Huahui Wu · 14 years ago
- a330ca6 am d5e8dae8: Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
- 712a7fb am c899d32e: docs: update search dev guide with SearcView widget by Scott Main · 14 years ago
- 40655ed am e0b33ce0: Add "new incognito window" translations. by Eric Fischer · 14 years ago
- 93e683b am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget by Scott Main · 14 years ago
- 5486e6d am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE by Eric Fischer · 14 years ago
- 48456a6 am 9f7b4ba6: Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
- d120445 am aa3ea7be: Add "new incognito window" translations. by Eric Fischer · 14 years ago
- b8847d1 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE by Huahui Wu · 14 years ago
- 3758c1b am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget by Scott Main · 14 years ago
- 605afd8 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE by Eric Fischer · 14 years ago
- 5290316 am abdf0d53: docs: update search dev guide with SearcView widget by Scott Main · 14 years ago
- 7175cac am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
- 8cf7363 am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1 by Eric Fischer · 14 years ago
- b066ddc Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 by Eric Fischer · 14 years ago
- 230de7b Merge "Add "new incognito window" translations." into honeycomb-mr1 by Eric Fischer · 14 years ago
- acd5de1 am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property. by Ramesh Sudini · 14 years ago
- fe974fc am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values. by Ramesh Sudini · 14 years ago
- 95315a5 am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower. by Wink Saville · 14 years ago
- 0eca33c am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. by Ramesh Sudini · 14 years ago
- 732e0d2 am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. by Wink Saville · 14 years ago
- 654e381 am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. by Wink Saville · 14 years ago
- adf53bf am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE by Wink Saville · 14 years ago
- 9460cac am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE by Wink Saville · 14 years ago
- 8ce5082 am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE by Wink Saville · 14 years ago
- 536c9e4 am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE by Wink Saville · 14 years ago
- ea1b0c6 am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE by Wink Saville · 14 years ago
- 4deedeb am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE by Wink Saville · 14 years ago
- 846d2b4 Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE by Wink Saville · 14 years ago
- 35f9c49 am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE by Wink Saville · 14 years ago
- 456b90a Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE by Wink Saville · 14 years ago
- fc2aa88 Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE by Wink Saville · 14 years ago
- 1ad816a Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE by Wink Saville · 14 years ago
- b979cc9 Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE by Wink Saville · 14 years ago
- 34840b1 Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE by Wink Saville · 14 years ago
- b66cc3d am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
- 32abb20 Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE by Wink Saville · 14 years ago
- 4feb59c resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
- 00ff0ca am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
- 2de4863 am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
- ea6193c am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
- bd9100b Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
- d567127 Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread by Gilles Debunne · 14 years ago
- 5a45a3e am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
- 4e29229 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
- 2652f09 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
- ee76b4c Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
- 7964f5b am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
- 6e53d8e am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
- 928595e am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
- 096b928 resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp by Nick Pelly · 14 years ago
- 33dff53 am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- bd7c76e Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- dc87971 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin by Gloria Wang · 14 years ago
- 50e4bf4 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 by Gloria Wang · 14 years ago
- 817b0a5 am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 52cf8ff am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 6f1547b Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 0b72b4e Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- e9459dc am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
- 96b60ba Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
- 108fa5a am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
- 884c410 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
- ec7c7f0 am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 103a217 Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 938125d am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 by Adam Powell · 14 years ago
- ba23ee2 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 by Adam Powell · 14 years ago
- 2e3c2f0 am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 by Glenn Kasten · 14 years ago
- 9f669c5 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 by Glenn Kasten · 14 years ago
- a05c7c2 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
- 71df979 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 by Nicolas Roard · 14 years ago
- 52d2b87 Merge "HTML5 Video improvements" into honeycomb-mr1 by Nicolas Roard · 14 years ago
- 0f1351e am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
- eb9d908 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
- d395d37 Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp by Robert Greenwalt · 14 years ago
- fce2201 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp by Robert Greenwalt · 14 years ago
- f3f7d35 Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
- 367798e am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- fd30a36 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 09eaf60 am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb by Joe Malin · 14 years ago
- 6cc95a9 am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb by Joe Malin · 14 years ago
- 447b17b Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb by Joe Malin · 14 years ago
- e64fc17 am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
- 1b9ff06 am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
- bac02fd am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 by Mike Lockwood · 14 years ago
- e195b4b Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 by Mike Lockwood · 14 years ago
- d3e53c1 am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 by Christopher Tate · 14 years ago
- 6fc20b0 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 by Christopher Tate · 14 years ago
- 8d4fb33 am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
- c9712bb am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
- 1f8c98d Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
- 3a9c0a0 Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
- 71d6c882 Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
- f0e9794 Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
- afada75 am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 by Glenn Kasten · 14 years ago
- 2ee08a1 Merge "Bug 3012968 DRM output control" into honeycomb-mr1 by Glenn Kasten · 14 years ago
- ef22134 am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 1fc8136 Merge "Support for USB accessory URIs" into honeycomb-mr1 by Mike Lockwood · 14 years ago
- 860a931 am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 by Jim Miller · 14 years ago
- 21daa91 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 by Jim Miller · 14 years ago