OSDN Git Service
Dianne Hackborn [Tue, 28 Feb 2012 23:07:43 +0000 (15:07 -0800)]
am
a2e0e3b5: am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:01:04 +0000 (15:01 -0800)]
Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
felipeal [Tue, 28 Feb 2012 22:09:43 +0000 (14:09 -0800)]
am
4bcc9108: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
4bcc910817c694c8d8b20e39a5ff42c584af1d49':
felipeal [Tue, 28 Feb 2012 22:07:26 +0000 (14:07 -0800)]
am
fa73815e: am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
fa73815e1d953e67c635877440e717dc84465d97':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
felipeal [Tue, 28 Feb 2012 22:05:23 +0000 (14:05 -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)
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:53:17 +0000 (13:53 -0800)]
am
e939edb5: am
f418738c: am
d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit '
e939edb5b4e991998ae8219b03d75c10cdc765cb':
Fixes update of extras Bundle in new Locations for GPS Provider
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:53:49 +0000 (11:53 -0800)]
am
eac4b187: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
eac4b187d357eac61475c4dc6f673656e08e75a9':
Jason Noguchi [Tue, 28 Feb 2012 19:52:56 +0000 (11:52 -0800)]
am
743aceec: am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
743aceec4289508a8c514dae7319659cf7f278c4':
Adding time lapse test to mediaframework stress suite.
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:49:30 +0000 (11:49 -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
Android Git Automerger [Tue, 28 Feb 2012 18:49:07 +0000 (10:49 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Svetoslav Ganov [Tue, 28 Feb 2012 18:39:17 +0000 (10:39 -0800)]
am
c78f1217: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
c78f121716ff7d4cbf8a70519a266ae030942751':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Tue, 28 Feb 2012 18:38:39 +0000 (10:38 -0800)]
am
0c7ffac4: am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
NumberPicker showing IME when its input field gains focus.
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.
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:18 +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 01:02:15 +0000 (17:02 -0800)]
am
7b6b81f8: am
f016dc1b: am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
7b6b81f89538d34415869710cbf464ba7c28bf9b':
stagefright amr: Avoid C++/C99 for loops with variable declaration
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:03:41 +0000 (16:03 -0800)]
am
84dd87d9: am
015a248e: am
93df415c: Merge "Add stubs for better compatibility"
* commit '
84dd87d992d88d1f407796a41bc8baa27dc97a81':
Add stubs for better compatibility
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:12:42 +0000 (13:12 -0800)]
am
bf826923: am
faf38b24: am
9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '
bf8269238be1c5bde9f82a986fb128d9a80f250b':
stagefright aacenc: Add prototypes for arm specific implementations of functions
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:39 +0000 (13:12 -0800)]
am
b7913f70: am
163777b8: am
354ac772: Merge "stagefright amrwb: Make local const arrays static"
* commit '
b7913f709b443df8d55ac2f6e080ab0ae38bcadf':
stagefright amrwb: Make local const arrays static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:37 +0000 (13:12 -0800)]
am
040c5b2c: am
ded8e681: am
695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '
040c5b2ca716bef082506065606cb9708d051625':
stagefright amrwb: Change a C++ style cast into a C style cast
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:34 +0000 (13:12 -0800)]
am
50ee92e9: am
d91b744d: am
f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* commit '
50ee92e972cf8a4cc56e95f44625eed649cc8196':
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:12:32 +0000 (13:12 -0800)]
am
a887ff9a: am
4f74be57: am
1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '
a887ff9ae61f6cb925feb6e08643716ac28e35db':
stagefright aacenc: Simplify the definition of __inline
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:29 +0000 (13:12 -0800)]
am
f7210cf5: am
7346d73c: am
77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
* commit '
f7210cf55cafef55cca8cca65e1749b1dd088e77':
stagefright amrwbenc: Remove a useless check
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:26 +0000 (13:12 -0800)]
am
3e61e413: am
32901b39: am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
3e61e413435ed745336c44d63fb6ffa6378e393b':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:24 +0000 (13:12 -0800)]
am
4bcdeb86: am
716a0517: am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
4bcdeb86965d25697e2439a53f791cd140c8fe6b':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:21 +0000 (13:12 -0800)]
am
bf5c5e5b: am
c1da1e1b: am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
bf5c5e5b03fda1b6397e95fa621ed9b0649a5360':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:12:19 +0000 (13:12 -0800)]
am
18643e70: am
6bc542e0: am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
18643e705a50f6c1c865e56e75d8403422a76d65':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
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"
Robert Ly [Mon, 27 Feb 2012 19:28:07 +0000 (11:28 -0800)]
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:46:00 +0000 (08:46 -0800)]
am
c76ca242: am
85cb9dec: Merge "docs: fix bug
5990526" into ics-mr1
* commit '
c76ca242ce2bd26c97c78ddf6842429850f541d9':
docs: fix bug
5990526
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:42:19 +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:36:34 +0000 (19:36 -0800)]
am
df154866: am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
df154866fbad10faf8f9bceb8843aca1e2a69984':
Xavier Ducrohet [Sat, 25 Feb 2012 03:35:25 +0000 (19:35 -0800)]
am
f038868d: am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
f038868d74af534effceaa8f1d932f9576f4f647':
Support rendering layout that use the new res-auto namespace.
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.
Xavier Ducrohet [Sat, 25 Feb 2012 03:32:32 +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:29:44 +0000 (16:29 -0800)]
Dianne Hackborn [Sat, 25 Feb 2012 00:26:57 +0000 (16:26 -0800)]
am
e65a9ab1: am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:25:30 +0000 (16:25 -0800)]
am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
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:42:43 +0000 (15:42 -0800)]
am
140da7c4: am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
140da7c4140f0536c3fad1f7be555ebd58055b63':
Dianne Hackborn [Fri, 24 Feb 2012 23:41:35 +0000 (15:41 -0800)]
am
dc5fa185: am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
Fix issue #
6048808: sometimes auto-correct is inactive
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:38:03 +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 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"
OSDN Git Service
