OSDN Git Service
Joe Fernandez [Thu, 23 Feb 2012 22:25:01 +0000 (14:25 -0800)]
am
566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
* commit '
566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/
6044027)
Joe Fernandez [Thu, 23 Feb 2012 22:22:41 +0000 (14:22 -0800)]
Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:59:22 +0000 (12:59 -0800)]
am
0e25e4cd: am
63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '
0e25e4cd292dbc6bce330a876dedb7154e5cd847':
Fix for issue 9656 - custom xml attributes in Android Libraries
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:57:03 +0000 (12:57 -0800)]
am
63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '
63e43ba56a95708c229eec539a544967f1bbb7d7':
Fix for issue 9656 - custom xml attributes in Android Libraries
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:38:12 +0000 (12:38 -0800)]
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
Michael Jurka [Thu, 23 Feb 2012 16:07:22 +0000 (08:07 -0800)]
am
bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '
bf378fd7d7a91085685fe9e5528b84c485041c77':
Don't allow screen invalidations to go outside bounds of screen
Scott Main [Thu, 23 Feb 2012 00:23:04 +0000 (16:23 -0800)]
am
68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '
68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
Scott Main [Thu, 23 Feb 2012 00:20:49 +0000 (16:20 -0800)]
Merge "docs: fix broken link" into ics-mr1
Jean-Baptiste Queru [Wed, 22 Feb 2012 20:36:35 +0000 (12:36 -0800)]
am
b92aee4e: am
69e9c30c: Merge "Add stubs for improved compatibility"
* commit '
b92aee4e8c3d93235c9a57afa81711383538f54f':
Add stubs for improved compatibility
Jean-Baptiste Queru [Wed, 22 Feb 2012 20:34:06 +0000 (12:34 -0800)]
am
69e9c30c: Merge "Add stubs for improved compatibility"
* commit '
69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
Add stubs for improved compatibility
Jean-Baptiste Queru [Wed, 22 Feb 2012 20:22:06 +0000 (12:22 -0800)]
Merge "Add stubs for improved compatibility"
Xavier Ducrohet [Wed, 22 Feb 2012 18:49:15 +0000 (10:49 -0800)]
am
503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '
503247f213ef2894324a22e7608101e90a7fe8fb':
Make sure resource references are resolved.
Xavier Ducrohet [Wed, 22 Feb 2012 18:47:32 +0000 (10:47 -0800)]
Merge "Make sure resource references are resolved." into ics-mr1
Jean-Baptiste Queru [Wed, 22 Feb 2012 18:17:24 +0000 (10:17 -0800)]
am
2d03a93e: Merge "Xcode 4.3 compatibility checkin"
* commit '
2d03a93ecf00fb43272364293a21f88720884ce2':
Xcode 4.3 compatibility checkin
Jean-Baptiste Queru [Wed, 22 Feb 2012 17:56:27 +0000 (09:56 -0800)]
am
4280891d: Merge "The bigger touch slop still has a problem"
* commit '
4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
The bigger touch slop still has a problem
Jean-Baptiste Queru [Wed, 22 Feb 2012 17:54:39 +0000 (09:54 -0800)]
Merge "Xcode 4.3 compatibility checkin"
Jean-Baptiste Queru [Wed, 22 Feb 2012 17:10:42 +0000 (09:10 -0800)]
Merge "The bigger touch slop still has a problem"
Rich Hyndman [Wed, 22 Feb 2012 11:43:21 +0000 (03:43 -0800)]
am
942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '
942b823ce4b2e0e11d395dffb2d340de01811612':
docs: Added Lint into Android Training and removed Layoutopt.
Rich Hyndman [Wed, 22 Feb 2012 11:41:05 +0000 (03:41 -0800)]
Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:34:49 +0000 (15:34 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibfaead4c0416959781113e6000356f954fe4cfb8
The Android Automerger [Tue, 21 Feb 2012 23:27:33 +0000 (15:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:06:33 +0000 (15:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I21e41892b352f1deeb7bef163d6b99217bb24a6b
Dianne Hackborn [Tue, 21 Feb 2012 22:57:46 +0000 (14:57 -0800)]
am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
Fix issue #
6037252: Screen shifts after all apps are upgraded
Jean-Baptiste Queru [Tue, 21 Feb 2012 20:30:46 +0000 (12:30 -0800)]
am
a91b052e: am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
a91b052e16196436fcd3a24caa894718db4d10d6':
Call onTimeChanged when AM/PM changed.
Jean-Baptiste Queru [Tue, 21 Feb 2012 20:28:38 +0000 (12:28 -0800)]
am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
fc24982a44d2b2b678fe5aa212b2e709d10e6413':
Call onTimeChanged when AM/PM changed.
Jean-Baptiste Queru [Tue, 21 Feb 2012 15:21:50 +0000 (07:21 -0800)]
Merge "Call onTimeChanged when AM/PM changed."
Al Sutton [Sun, 19 Feb 2012 08:31:19 +0000 (08:31 +0000)]
Xcode 4.3 compatibility checkin
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases
Signed-off-by: Al Sutton <al@funkyandroid.com>
The Android Automerger [Sat, 18 Feb 2012 00:38:41 +0000 (16:38 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:55:56 +0000 (15:55 -0800)]
am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
2d559b5311be1cd909e5a445afe75a840688b822':
fix NPE in race condition.
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:53:50 +0000 (15:53 -0800)]
Merge "fix NPE in race condition." into ics-mr1
Adam Powell [Fri, 17 Feb 2012 23:25:29 +0000 (15:25 -0800)]
am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
482ae5f2388a07d60d7f3b54432120172af25eee':
Bug
6021294 - Contextual action bar animation tweaks
Jean-Baptiste Queru [Fri, 17 Feb 2012 21:18:34 +0000 (13:18 -0800)]
am
44c1f012: Merge "Return error code when composing PDU fails"
* commit '
44c1f012c4ffa75853a068963b212ee1c965b6ea':
Return error code when composing PDU fails
Jean-Baptiste Queru [Fri, 17 Feb 2012 21:18:31 +0000 (13:18 -0800)]
am
c2461eb3: Merge "Add support for bmp and wav content types in MMS"
* commit '
c2461eb32ebad522a946e9fef9c31e886d98124a':
Add support for bmp and wav content types in MMS
Jean-Baptiste Queru [Fri, 17 Feb 2012 19:36:51 +0000 (11:36 -0800)]
Merge "Return error code when composing PDU fails"
Jean-Baptiste Queru [Fri, 17 Feb 2012 19:03:34 +0000 (11:03 -0800)]
Merge "Add support for bmp and wav content types in MMS"
Jean-Baptiste Queru [Fri, 17 Feb 2012 18:13:05 +0000 (10:13 -0800)]
am
a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons"
* commit '
a1ee18f1413471813f36a1d05927f5513c8931f5':
Increase PDU parts buffer size for performance reasons
Jean-Baptiste Queru [Fri, 17 Feb 2012 17:53:28 +0000 (09:53 -0800)]
Merge "Increase PDU parts buffer size for performance reasons"
The Android Open Source Project [Fri, 17 Feb 2012 16:09:34 +0000 (08:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
Marc Blank [Fri, 17 Feb 2012 00:54:41 +0000 (16:54 -0800)]
am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
094bf51ec0911057263a27db4d79db4eface2d63':
Use ' for apostrophe in HTML encoding DO NOT MERGE
The Android Automerger [Fri, 17 Feb 2012 00:26:06 +0000 (16:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Thu, 16 Feb 2012 22:44:03 +0000 (14:44 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
The Android Open Source Project [Thu, 16 Feb 2012 18:02:15 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:29:07 +0000 (09:29 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:24:42 +0000 (09:24 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:23:01 +0000 (09:23 -0800)]
Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
Scott Main [Thu, 16 Feb 2012 01:34:09 +0000 (17:34 -0800)]
am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '
2a1d19174e32bb6056086ec603948cd476a2ea67':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:31:54 +0000 (17:31 -0800)]
Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1
Scott Main [Wed, 15 Feb 2012 21:26:51 +0000 (13:26 -0800)]
am
26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '
26703326784a6de45830236bd0a97345f93448d4':
docs: Google+ badge now sizes properly; remove reposition hack
The Android Automerger [Tue, 14 Feb 2012 22:15:44 +0000 (14:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:41:47 +0000 (13:41 -0800)]
am
c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '
c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
Robert Greenwalt [Tue, 14 Feb 2012 21:39:25 +0000 (13:39 -0800)]
am
fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '
fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
Robert Greenwalt [Tue, 14 Feb 2012 21:38:15 +0000 (13:38 -0800)]
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:37:44 +0000 (13:37 -0800)]
Merge "Add a config to set Dun capabilities." into ics-mr1
Justin Ho [Tue, 14 Feb 2012 21:31:00 +0000 (13:31 -0800)]
am
c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
* commit '
c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug:
5724605
Justin Ho [Tue, 14 Feb 2012 21:29:08 +0000 (13:29 -0800)]
Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
Joe Fernandez [Tue, 14 Feb 2012 20:37:18 +0000 (12:37 -0800)]
am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 20:37:16 +0000 (12:37 -0800)]
am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 20:37:14 +0000 (12:37 -0800)]
am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Joe Fernandez [Tue, 14 Feb 2012 20:05:25 +0000 (12:05 -0800)]
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
Mike Lockwood [Tue, 14 Feb 2012 19:30:05 +0000 (11:30 -0800)]
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1
John Wang [Tue, 14 Feb 2012 18:09:26 +0000 (10:09 -0800)]
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 03:58:09 +0000 (19:58 -0800)]
am
eaf2617f: am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
eaf2617fc20dd6484722edc9df41faf6e91d73cc':
Fix incorrect prototype for JNI call
Jean-Baptiste Queru [Tue, 14 Feb 2012 03:55:52 +0000 (19:55 -0800)]
am
472512f6: Merge "Fix incorrect prototype for JNI call"
* commit '
472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
Fix incorrect prototype for JNI call
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:32:32 +0000 (14:32 -0800)]
Merge "Fix incorrect prototype for JNI call"
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:43:07 +0000 (13:43 -0800)]
am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:41:37 +0000 (13:41 -0800)]
Merge "extending timeout to stabilize tests" into ics-mr1
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
Wink Saville [Fri, 10 Feb 2012 23:12:19 +0000 (15:12 -0800)]
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
Eric Fischer [Fri, 10 Feb 2012 21:11:45 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:09:42 +0000 (10:09 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Scott Main [Fri, 10 Feb 2012 00:01:51 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
The Android Open Source Project [Tue, 7 Feb 2012 18:09:07 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
John Wang [Tue, 7 Feb 2012 01:02:30 +0000 (17:02 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:00:49 +0000 (17:00 -0800)]
Merge "Don't use SNR in the invalid check." into ics-mr1
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:56 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Scott Main [Mon, 6 Feb 2012 22:12:03 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:10:16 +0000 (14:10 -0800)]
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:09:36 +0000 (14:09 -0800)]
am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:07:31 +0000 (14:07 -0800)]
am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:01:05 +0000 (14:01 -0800)]
Merge "Skia API changes as a result of an update to the Skia library."
Scott Main [Mon, 6 Feb 2012 21:05:04 +0000 (13:05 -0800)]
am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:03:16 +0000 (13:03 -0800)]
Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:56 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Scott Main [Wed, 1 Feb 2012 23:12:33 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:00:49 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 19:56:23 +0000 (11:56 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:54:57 +0000 (11:54 -0800)]
Merge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:45:51 +0000 (11:45 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:45:49 +0000 (11:45 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" into ics-mr1
Xia Wang [Wed, 1 Feb 2012 18:54:30 +0000 (10:54 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:51:43 +0000 (10:51 -0800)]
Merge "Fix a typo in image processing test" into ics-mr1
The Android Open Source Project [Wed, 1 Feb 2012 16:42:59 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f