OSDN Git Service
The Android Open Source Project [Fri, 24 Feb 2012 22:12:35 +0000 (14:12 -0800)]
am
2ddd7b3e: Reconcile with ics-mr1-release
* commit '
2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
The Android Open Source Project [Fri, 24 Feb 2012 22:05:51 +0000 (14:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
The Android Open Source Project [Fri, 24 Feb 2012 22:01:27 +0000 (14:01 -0800)]
am
aac21480: Reconcile with ics-mr1-release
* commit '
aac214800b518259306960ff9cc90de65d095398':
The Android Open Source Project [Fri, 24 Feb 2012 21:57:46 +0000 (13:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:07:45 +0000 (11:07 -0800)]
am
47023027: am
26d9944e: am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
470230275431c8ae85debc3c089b6942c55fef0f':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:05:15 +0000 (11:05 -0800)]
am
26d9944e: am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
26d9944e3f75123708ef0cfb158f48709348a361':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:02:29 +0000 (11:02 -0800)]
am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:32:34 +0000 (10:32 -0800)]
am
14c6e272: am
2accfc11: am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:30:12 +0000 (10:30 -0800)]
am
428ece23: am
c4aa19a5: am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
428ece23f414d288981ea0ac8f326e9e71a57959':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:29:45 +0000 (10:29 -0800)]
am
2accfc11: am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
2accfc110a71add56f5e4c35228e88dfa3024676':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:28:00 +0000 (10:28 -0800)]
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:27:06 +0000 (10:27 -0800)]
am
c4aa19a5: am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
c4aa19a578b8a11bea225994c58116b407e63a69':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:26:53 +0000 (10:26 -0800)]
am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
d6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:24:34 +0000 (10:24 -0800)]
am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
ea227787253e29da2d688399b097e05708d3bf73':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:22:33 +0000 (10:22 -0800)]
Merge "stagefright aacenc: Fix an inline asm constraint"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:07:47 +0000 (10:07 -0800)]
Merge changes I903353c5,I822dcc74
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:00:56 +0000 (10:00 -0800)]
am
61022b06: am
5f83b957: am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
61022b06a352e5a6da382a09f51ea624581ada7f':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:57:51 +0000 (09:57 -0800)]
am
5f83b957: am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
5f83b95705fa84b87b498d67f3b1b8dc34038474':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:54:58 +0000 (09:54 -0800)]
am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:50:27 +0000 (09:50 -0800)]
am
459df4ef: am
e7650c32: am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
459df4ef8368ea84ce7d07981c6867a7b7fef14e':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:48:14 +0000 (09:48 -0800)]
am
e7650c32: am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
e7650c327980f15c6cd53ad0081a54d78c3248f0':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:47:22 +0000 (09:47 -0800)]
Merge "stagefright aacenc: Zero-initialize a struct"
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:45:40 +0000 (09:45 -0800)]
am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:25:34 +0000 (09:25 -0800)]
am
7e8b65df: am
7ffa4546: am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
7e8b65dfbaaf1e5901e49e048f92b19c184eabe4':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:23:23 +0000 (09:23 -0800)]
am
7ffa4546: am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:44 +0000 (09:20 -0800)]
am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:36 +0000 (09:20 -0800)]
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:57:40 +0000 (08:57 -0800)]
am
901b8bb0: am
aa86aa60: am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
901b8bb09ffdb0c64c0a8522016ffc1da6358a92':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:53:30 +0000 (08:53 -0800)]
am
aa86aa60: am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:53:24 +0000 (08:53 -0800)]
Merge "stagefright aacenc: Add const declarations to some pointers"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:50:32 +0000 (08:50 -0800)]
am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:38:22 +0000 (08:38 -0800)]
Merge "stagefright aacenc: Fix inline asm"
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:59:05 +0000 (07:59 -0800)]
am
41087f79: am
d7ab4e0c: am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
41087f7920196f81a50f320c9d538b36534f178d':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:55:59 +0000 (07:55 -0800)]
am
d7ab4e0c: am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
d7ab4e0c42a34331620c63c8c58d0dabc658eb1a':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:53:43 +0000 (07:53 -0800)]
am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:39:02 +0000 (07:39 -0800)]
Merge "stagefright aacenc: Fix inline asm constraints"
Xavier Ducrohet [Fri, 24 Feb 2012 02:45:56 +0000 (18:45 -0800)]
am
f31297ed: am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
f31297edf899997dc9f173f6ddca30b0e4f2d677':
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.
Xavier Ducrohet [Fri, 24 Feb 2012 02:41:48 +0000 (18:41 -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: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.
Xavier Ducrohet [Fri, 24 Feb 2012 00:59:27 +0000 (16:59 -0800)]
Move the automatic namespace outside of the res namespace. do not merge.
(cherry picked from commit
d9fe8018ffbf94f18a840005e688ad1d712f0225)
Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
inazaruk [Sun, 22 May 2011 22:09:06 +0000 (15:09 -0700)]
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.
Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>
(cherry picked from commit
e348909c1966c3d192841cc131a32be6ed90da18)
Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
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
Andrew Flynn [Thu, 23 Feb 2012 23:45:06 +0000 (15:45 -0800)]
DO NOT MERGE Return 1.5 * density as default for large screens.
Change-Id: Ib2d390803f08812636364ceb3849eddf80044072
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"
The Android Automerger [Thu, 23 Feb 2012 18:45:15 +0000 (10:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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
Michael Jurka [Thu, 23 Feb 2012 08:02:49 +0000 (00:02 -0800)]
Don't allow screen invalidations to go outside bounds of screen
Fixes invalidation issue in Launcher
Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
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
Joe Fernandez [Tue, 21 Feb 2012 23:30:14 +0000 (15:30 -0800)]
docs: NDK overview, remove x86 instruction set mention (b/
6044027)
Change-Id: I37ee68fb78f2ed5edc1c34ff7198340b1ab5c49b
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':
OSDN Git Service
