OSDN Git Service
felipeal [Tue, 28 Feb 2012 22:04:20 +0000 (14:04 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:33:44 +0000 (13:33 -0800)]
am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
f418738c64413b818e2dc507c912c2678876632f':
Fixes update of extras Bundle in new Locations for GPS Provider
Jean-Baptiste Queru [Tue, 28 Feb 2012 21:30:39 +0000 (13:30 -0800)]
am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
d7fa7deef9bc0cf22bf450fdb062327697c087c4':
Fixes update of extras Bundle in new Locations for GPS Provider
Jason Noguchi [Tue, 28 Feb 2012 19:50:14 +0000 (11:50 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)]
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:43 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
Jean-Baptiste Queru [Tue, 28 Feb 2012 15:28:51 +0000 (07:28 -0800)]
Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:59:59 +0000 (16:59 -0800)]
am
f016dc1b: am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
f016dc1bd7f9a67adac13b0b564692dab8723392':
stagefright amr: Avoid C++/C99 for loops with variable declaration
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:57:06 +0000 (16:57 -0800)]
am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
f881fa517978adc7ea610a1982e0d071f1fd3425':
stagefright amr: Avoid C++/C99 for loops with variable declaration
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:23:18 +0000 (16:23 -0800)]
Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
Jean-Baptiste Queru [Tue, 28 Feb 2012 00:01:31 +0000 (16:01 -0800)]
am
015a248e: am
93df415c: Merge "Add stubs for better compatibility"
* commit '
015a248e631dc10fd6b52ae8773c0a3e0cf752af':
Add stubs for better compatibility
Jean-Baptiste Queru [Mon, 27 Feb 2012 23:58:50 +0000 (15:58 -0800)]
am
93df415c: Merge "Add stubs for better compatibility"
* commit '
93df415c1e0b4c99f274adb3629ce19abf1d0f53':
Add stubs for better compatibility
Jean-Baptiste Queru [Mon, 27 Feb 2012 23:36:21 +0000 (15:36 -0800)]
Merge "Add stubs for better compatibility"
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:10:10 +0000 (13:10 -0800)]
am
faf38b24: am
9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '
faf38b24c0255ea7492277b0aa03a401dbdbb2b8':
stagefright aacenc: Add prototypes for arm specific implementations of functions
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:10:07 +0000 (13:10 -0800)]
am
163777b8: am
354ac772: Merge "stagefright amrwb: Make local const arrays static"
* commit '
163777b8be102a10f6e4a4a6c5be90eed2a479d2':
stagefright amrwb: Make local const arrays static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:10:04 +0000 (13:10 -0800)]
am
ded8e681: am
695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '
ded8e6818dbec3f1a6589345f0d8d6b189e1ea2b':
stagefright amrwb: Change a C++ style cast into a C style cast
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:10:00 +0000 (13:10 -0800)]
am
d91b744d: am
f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* commit '
d91b744dedaa19a42ea9d878cfa5925cb15b2698':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:09:57 +0000 (13:09 -0800)]
am
4f74be57: am
1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '
4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
stagefright aacenc: Simplify the definition of __inline
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:09:53 +0000 (13:09 -0800)]
am
7346d73c: am
77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
* commit '
7346d73cac355f2b05051450eb1059d5e11e4ffb':
stagefright amrwbenc: Remove a useless check
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:09:50 +0000 (13:09 -0800)]
am
32901b39: am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
32901b397b590cc9133d21caab20b5ef01f0dd04':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:09:46 +0000 (13:09 -0800)]
am
716a0517: am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
716a051719993cae576590f6a43620697e50b3b5':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:09:43 +0000 (13:09 -0800)]
am
c1da1e1b: am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
c1da1e1b2f18896c65df85de93a07680175c5277':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:09:40 +0000 (13:09 -0800)]
am
6bc542e0: am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:43 +0000 (13:07 -0800)]
am
9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '
9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
stagefright aacenc: Add prototypes for arm specific implementations of functions
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:40 +0000 (13:07 -0800)]
am
354ac772: Merge "stagefright amrwb: Make local const arrays static"
* commit '
354ac772eca0afea25dd12d233e5cdee9677888b':
stagefright amrwb: Make local const arrays static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:36 +0000 (13:07 -0800)]
am
695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '
695cfe1e1e189f176fdf994f72d05a0129a66394':
stagefright amrwb: Change a C++ style cast into a C style cast
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:33 +0000 (13:07 -0800)]
am
f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* commit '
f7f1280e0c71d64098efb42b58a922d056164b5e':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:30 +0000 (13:07 -0800)]
am
1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '
1a864db7723a7947b72d24e6008ba48341d0feff':
stagefright aacenc: Simplify the definition of __inline
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:26 +0000 (13:07 -0800)]
am
77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
* commit '
77576ff487e227092cdaf09db163e21f1e07604a':
stagefright amrwbenc: Remove a useless check
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:23 +0000 (13:07 -0800)]
am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
be9a705586edafcedc9fabb94d3259f882b7cbd7':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:20 +0000 (13:07 -0800)]
am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:16 +0000 (13:07 -0800)]
am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:12 +0000 (13:07 -0800)]
am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
5aff259c61e54e441ed04bf77e3cc69a0374432d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Jean-Baptiste Queru [Mon, 27 Feb 2012 20:14:40 +0000 (12:14 -0800)]
Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
Jean-Baptiste Queru [Mon, 27 Feb 2012 20:14:01 +0000 (12:14 -0800)]
Merge "stagefright amrwb: Make local const arrays static"
Jean-Baptiste Queru [Mon, 27 Feb 2012 20:13:26 +0000 (12:13 -0800)]
Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:16:22 +0000 (11:16 -0800)]
Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* changes:
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:11:56 +0000 (11:11 -0800)]
Merge "stagefright aacenc: Simplify the definition of __inline"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:11:17 +0000 (11:11 -0800)]
Merge "stagefright amrwbenc: Remove a useless check"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:09:58 +0000 (11:09 -0800)]
Merge "stagefright aacenc: Remove a stray semicolon"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:08:08 +0000 (11:08 -0800)]
Merge "stagefright amrwb: Make a global const array static"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:06:24 +0000 (11:06 -0800)]
Merge "stagefright amrwbenc: Change keyword ordering"
Jean-Baptiste Queru [Mon, 27 Feb 2012 18:58:50 +0000 (10:58 -0800)]
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
Jean-Baptiste Queru [Mon, 27 Feb 2012 16:54:57 +0000 (08:54 -0800)]
Add stubs for better compatibility
Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
Robert Ly [Mon, 27 Feb 2012 16:42:48 +0000 (08:42 -0800)]
am
85cb9dec: Merge "docs: fix bug
5990526" into ics-mr1
* commit '
85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug
5990526
Robert Ly [Mon, 27 Feb 2012 16:40:54 +0000 (08:40 -0800)]
Merge "docs: fix bug
5990526" into ics-mr1
Xavier Ducrohet [Sat, 25 Feb 2012 03:32:47 +0000 (19:32 -0800)]
am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
Dianne Hackborn [Sat, 25 Feb 2012 00:24:40 +0000 (16:24 -0800)]
am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:23:07 +0000 (16:23 -0800)]
Merge "Fix build." into ics-mr1
Dianne Hackborn [Fri, 24 Feb 2012 23:38:07 +0000 (15:38 -0800)]
am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
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: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: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 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: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: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: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: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: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.
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"
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: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