OSDN Git Service
inazaruk [Fri, 24 Feb 2012 02:45:53 +0000 (18:45 -0800)]
am
68ad43e1: am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
68ad43e10ba76721295e66b746c5f5c5e7094a0b':
Andrew Flynn [Fri, 24 Feb 2012 02:45:52 +0000 (18:45 -0800)]
am
ec63cd85: Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
* commit '
ec63cd85c8b7f90a39e04aeec560fea7ea973b9a':
DO NOT MERGE Return 1.5 * density as default for large screens.
Joe Fernandez [Fri, 24 Feb 2012 02:45:51 +0000 (18:45 -0800)]
am
c6e3f6f1: am
566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
* commit '
c6e3f6f1a758a91d486cbcebb8241f8413c6e770':
Xavier Ducrohet [Fri, 24 Feb 2012 02:44:16 +0000 (18:44 -0800)]
am
b3c780f1: am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
b3c780f16c37d2fb41a4eb211ea062b4c0b4e366':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:44:14 +0000 (18:44 -0800)]
am
9694910e: am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
9694910e17a18c307e61811284f88a26db2bfbae':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:42:01 +0000 (18:42 -0800)]
am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:41:54 +0000 (18:41 -0800)]
am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
inazaruk [Fri, 24 Feb 2012 02:41:43 +0000 (18:41 -0800)]
am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Andrew Flynn [Fri, 24 Feb 2012 00:09:36 +0000 (16:09 -0800)]
Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
Joe Fernandez [Thu, 23 Feb 2012 22:28:07 +0000 (14:28 -0800)]
am
53c0d46d: am
566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
* commit '
53c0d46d85a651093382a92466b0b0658ef1920c':
docs: NDK overview, remove x86 instruction set mention (b/
6044027)
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:24:53 +0000 (14:24 -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 21:01:59 +0000 (13:01 -0800)]
am
fe99051c: am
0e25e4cd: am
63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '
fe99051c78994e0cc5153468eeba6f75f3e04b8e':
Fix for issue 9656 - custom xml attributes in Android Libraries
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:11:45 +0000 (08:11 -0800)]
am
a7e1d8d5: am
bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '
a7e1d8d5f7d16cd1004189f9aee727962790b8bf':
Michael Jurka [Thu, 23 Feb 2012 16:09:59 +0000 (08:09 -0800)]
am
0a232673: am
bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '
0a232673370989f54e05fd2508ce90267a54abd1':
Don't allow screen invalidations to go outside bounds of screen
Michael Jurka [Thu, 23 Feb 2012 16:07:51 +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
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:27:16 +0000 (16:27 -0800)]
am
2a24914c: am
68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '
2a24914caf7dd2906b0af3b82c40db5917b6e545':
Scott Main [Thu, 23 Feb 2012 00:25:49 +0000 (16:25 -0800)]
am
ce980d8e: am
68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '
ce980d8ea0c4747ee23b05dfcc7c02655f595fde':
docs: fix broken link
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:23:03 +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
Xavier Ducrohet [Wed, 22 Feb 2012 20:54:50 +0000 (12:54 -0800)]
am
1f46d79f: am
503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '
1f46d79faf1b947b3d169c336e013cea89e8de11':
Jean-Baptiste Queru [Wed, 22 Feb 2012 20:39:13 +0000 (12:39 -0800)]
am
1cd83102: am
b92aee4e: am
69e9c30c: Merge "Add stubs for improved compatibility"
* commit '
1cd83102d4950327a6bd76f27b5d320d77e4bf84':
Add stubs for improved compatibility
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:52:16 +0000 (10:52 -0800)]
am
22701ec5: am
503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '
22701ec5b11f6138e6298814fff5f09da82df144':
Make sure resource references are resolved.
Xavier Ducrohet [Wed, 22 Feb 2012 18:49:35 +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: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:23:09 +0000 (10:23 -0800)]
am
fc4215ee: am
2d03a93e: Merge "Xcode 4.3 compatibility checkin"
* commit '
fc4215eec9b947628c3ab5b3707711d16da19120':
Xcode 4.3 compatibility checkin
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 18:01:01 +0000 (10:01 -0800)]
am
aff90790: am
4280891d: Merge "The bigger touch slop still has a problem"
* commit '
aff90790dff94eb9a4bed541eff4f106623afd09':
The bigger touch slop still has a problem
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 12:03:24 +0000 (04:03 -0800)]
am
3ebde8a2: am
942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '
3ebde8a2304296565a870339cd47bfc08b021083':
Rich Hyndman [Wed, 22 Feb 2012 11:45:48 +0000 (03:45 -0800)]
am
22c98df9: am
942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '
22c98df9d6180a5d28db3525b3aba81c4f04fa2c':
docs: Added Lint into Android Training and removed Layoutopt.
Rich Hyndman [Wed, 22 Feb 2012 11:43:35 +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: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 [Wed, 22 Feb 2012 04:16:01 +0000 (20:16 -0800)]
am
41cea4b5: Reconcile with ics-mr1-release
* commit '
41cea4b5a631708c45255eeb2299ed9d522c8ba3':
The Android Open Source Project [Tue, 21 Feb 2012 23:38:35 +0000 (15:38 -0800)]
am
64a907c5: Reconcile with ics-mr1-release
* commit '
64a907c5fddb9846737a8e60e603ccbe2267a930':
The Android Open Source Project [Tue, 21 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id8505107b41a8b89c123c16d33f609480a555632
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:17:26 +0000 (15:17 -0800)]
am
6815d49c: Reconcile with ics-mr1-release
* commit '
6815d49cfa1ee74ffc8e9640e42d0fd1a7592286':
The Android Open Source Project [Tue, 21 Feb 2012 23:13:30 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic0dc3fd4a476aecd8854c8a919ba1e096cc938f0
The Android Open Source Project [Tue, 21 Feb 2012 23:10:34 +0000 (15:10 -0800)]
am
8013fd39: Reconcile with ics-mr1-release
* commit '
8013fd391e0354c58b193373f5d2db2a22f94081':
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 23:00:40 +0000 (15:00 -0800)]
am
f08beab2: am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
f08beab2d10bda159722aea6b01bf4320cff6480':
Dianne Hackborn [Tue, 21 Feb 2012 22:59:38 +0000 (14:59 -0800)]
am
2aae2d96: am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
2aae2d9633dab528b74fb4d9c8266d82638e05ff':
Fix issue #
6037252: Screen shifts after all apps are upgraded
Dianne Hackborn [Tue, 21 Feb 2012 22:57:55 +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
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:33:20 +0000 (12:33 -0800)]
am
f3d94b44: am
a91b052e: am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
f3d94b4425615c08c3f9891726f0753142ce54de':
Call onTimeChanged when AM/PM changed.
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."
Tsu Chiang Chuang [Sun, 19 Feb 2012 15:46:04 +0000 (07:46 -0800)]
am
90cfe0f2: am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
90cfe0f2f1e0e54c876157862abc0a588ef84b93':
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:58:12 +0000 (15:58 -0800)]
am
a626f8d6: am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
a626f8d61bbcac2159a4f3c7b6e03c8dda482c78':
fix NPE in race condition.
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:55:44 +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:27:46 +0000 (15:27 -0800)]
am
8035db11: am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
8035db11ef3da209432b50dc178883ce4683336a':
Adam Powell [Fri, 17 Feb 2012 23:26:56 +0000 (15:26 -0800)]
am
fef000e3: am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
fef000e3fa968a8dd165753f16c1c4cd38d59f33':
Bug
6021294 - Contextual action bar animation tweaks
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
Adam Powell [Fri, 17 Feb 2012 23:25:18 +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:22:56 +0000 (13:22 -0800)]
am
1d4c4d42: am
44c1f012: Merge "Return error code when composing PDU fails"
* commit '
1d4c4d42edb92a3dd82238eafef23a0bfa0267d3':
Return error code when composing PDU fails
Jean-Baptiste Queru [Fri, 17 Feb 2012 21:22:54 +0000 (13:22 -0800)]
am
99ccf407: am
c2461eb3: Merge "Add support for bmp and wav content types in MMS"
* commit '
99ccf407bf7fc96eab9e1f747e0fa93391330438':
Add support for bmp and wav content types in MMS
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"
The Android Open Source Project [Fri, 17 Feb 2012 18:46:48 +0000 (10:46 -0800)]
am
f5f5d61c: Reconcile with ics-mr1-release
* commit '
f5f5d61c611b6f2c699ba472972e0b5c33c82402':
Jean-Baptiste Queru [Fri, 17 Feb 2012 18:18:49 +0000 (10:18 -0800)]
am
8a33803d: am
a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons"
* commit '
8a33803df5477bb9bd20bfae8c7a7d0833f6d2a9':
Increase PDU parts buffer size for performance reasons
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 17:02:50 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
The Android Open Source Project [Fri, 17 Feb 2012 16:13:35 +0000 (08:13 -0800)]
am
c30fdda0: Reconcile with ics-mr1-release
* commit '
c30fdda052e82ca7b014b9817945e465cca78c75':
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:57:34 +0000 (16:57 -0800)]
am
d3ea7331: am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
d3ea7331041a4e0b30acb4d86d14318c407df53b':
Marc Blank [Fri, 17 Feb 2012 00:56:36 +0000 (16:56 -0800)]
am
970c74ac: am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
970c74acb16529b73c03d93469472c3c3ba6af35':
Use ' for apostrophe in HTML encoding DO NOT MERGE
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
Marc Blank [Fri, 17 Feb 2012 00:54:23 +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:46:41 +0000 (14:46 -0800)]
am
1db7eeac: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
1db7eeac74d1455991e1dc0f532b47276d0c679c':
Dianne Hackborn [Thu, 16 Feb 2012 22:45:57 +0000 (14:45 -0800)]
am
01810bbb: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
Fix last change -- don't call startInputInner() with lock held.
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.
Dianne Hackborn [Thu, 16 Feb 2012 22:43:43 +0000 (14:43 -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:13:52 +0000 (10:13 -0800)]
am
e113e793: Reconcile with ics-mr1-release
* commit '
e113e793b32ca4c7fe41de41c40a34c494b4c783':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:13 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
The Android Open Source Project [Thu, 16 Feb 2012 18:04:19 +0000 (10:04 -0800)]
am
9777fb10: Reconcile with ics-mr1-release
* commit '
9777fb106f3705e2a9610c4f9020d7f68941d83c':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:15 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3