OSDN Git Service
Jeff Sharkey [Tue, 28 Feb 2012 02:09:29 +0000 (18:09 -0800)]
Merge "Move NetworkStatsFactory to faster ProcFileReader."
Jamie Gennis [Tue, 28 Feb 2012 02:06:39 +0000 (18:06 -0800)]
Merge "Add tracing to various graphics components."
Jamie Gennis [Fri, 24 Feb 2012 03:27:23 +0000 (19:27 -0800)]
Add tracing to various graphics components.
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.
Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
Jeff Sharkey [Tue, 28 Feb 2012 01:44:09 +0000 (17:44 -0800)]
Merge "Suppress StrictMode when reading /proc/ files."
Adam Powell [Tue, 28 Feb 2012 01:38:51 +0000 (17:38 -0800)]
Merge "View pressed state dispatching tweaks"
Mathias Agopian [Tue, 28 Feb 2012 01:38:27 +0000 (17:38 -0800)]
Merge "remove dependency on unneeded headers"
Chia-chi Yeh [Tue, 28 Feb 2012 01:35:06 +0000 (17:35 -0800)]
Merge "VpnDialogs: hide the fields when the statistic numbers are unavailable."
Michael Jurka [Tue, 28 Feb 2012 01:15:41 +0000 (17:15 -0800)]
Merge "Remove unnecessary code"
Jamie Gennis [Tue, 28 Feb 2012 01:06:53 +0000 (17:06 -0800)]
Merge "Removed dependecies between BufferQueue and SurfaceTexture"
JP Abgrall [Tue, 28 Feb 2012 01:05:55 +0000 (17:05 -0800)]
Merge "dumpstate: use /system/xbin/su directly"
Dave Burke [Tue, 28 Feb 2012 01:01:38 +0000 (17:01 -0800)]
Merge "Increase max size of log size by 50% on userdebug builds."
Daniel Lam [Sun, 22 Jan 2012 23:26:27 +0000 (15:26 -0800)]
Removed dependecies between BufferQueue and SurfaceTexture
Refactored SurfaceTexture and BufferQueue such that share
no protected members. Created an consumer facing interface
for BufferQueue in preparation of connecting SurfaceTexture
and BufferQueue through a binder.
Change-Id: I938e63e085128148c58d0e26c7213b30145c109f
felipeal [Tue, 28 Feb 2012 00:39:50 +0000 (16:39 -0800)]
Merge "Fixed minor typo on Javadoc"
Eric Laurent [Tue, 28 Feb 2012 00:35:30 +0000 (16:35 -0800)]
Merge "audio preprocessing: fix multiple enable problem"
Alon Albert [Tue, 28 Feb 2012 00:29:55 +0000 (16:29 -0800)]
Merge "Add new Reminder Method: Alarm"
Craig Mautner [Tue, 28 Feb 2012 00:28:15 +0000 (16:28 -0800)]
Merge "Fix bug introduced when moving animation step out from between assignments to wasAnimating and nowAnimating. Now wasAnimating once again contains the animation state prior to the animation step."
Eric Fischer [Mon, 27 Feb 2012 23:41:31 +0000 (15:41 -0800)]
Merge "Import translations. DO NOT MERGE"
Gilles Debunne [Mon, 27 Feb 2012 23:30:57 +0000 (15:30 -0800)]
Merge "Selection highlight made possible with no editor"
Gilles Debunne [Mon, 27 Feb 2012 23:30:37 +0000 (15:30 -0800)]
Merge "Fix for NPE on long press to start a selection on text."
Gilles Debunne [Mon, 27 Feb 2012 23:28:49 +0000 (15:28 -0800)]
Merge "Fix for NPE when dragging on TextView"
Alex Sakhartchouk [Mon, 27 Feb 2012 23:08:07 +0000 (15:08 -0800)]
Merge "Removing GL calls from librs"
George Mount [Mon, 27 Feb 2012 23:06:29 +0000 (15:06 -0800)]
Merge "Perform action when action button pressed during text input."
George Mount [Mon, 27 Feb 2012 22:21:03 +0000 (14:21 -0800)]
Merge "Paste window instead of action bar when cursor shown."
John Huang [Mon, 27 Feb 2012 21:47:13 +0000 (13:47 -0800)]
Merge "Prevent dial() return null in a racing condition."
Romain Guy [Mon, 27 Feb 2012 21:35:37 +0000 (13:35 -0800)]
Merge "Small optimization for the battery status screen"
Jamie Gennis [Mon, 27 Feb 2012 21:35:30 +0000 (13:35 -0800)]
Merge "libutils: add a system-wide tracing utility"
Glenn Kasten [Mon, 27 Feb 2012 21:23:51 +0000 (13:23 -0800)]
Merge "Fix tracking of hardware state for dump"
Jamie Gennis [Mon, 27 Feb 2012 21:15:53 +0000 (13:15 -0800)]
Merge "Revert "Removed dependecies between BufferQueue and SurfaceTexture""
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:15 +0000 (13:15 -0800)]
am
19bb6261: am
bf826923: am
faf38b24: am
9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '
19bb62613f512b62d492fb4caf36de88fd1914dd':
stagefright aacenc: Add prototypes for arm specific implementations of functions
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:13 +0000 (13:15 -0800)]
am
360db46e: am
b7913f70: am
163777b8: am
354ac772: Merge "stagefright amrwb: Make local const arrays static"
* commit '
360db46e78a1492b695d5be6e779386dc66a502e':
stagefright amrwb: Make local const arrays static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:10 +0000 (13:15 -0800)]
am
5ba910d8: am
040c5b2c: am
ded8e681: am
695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '
5ba910d867d029e69c4f52667c02a4c114f849df':
stagefright amrwb: Change a C++ style cast into a C style cast
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:06 +0000 (13:15 -0800)]
am
b205a5d8: am
50ee92e9: am
d91b744d: am
f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* commit '
b205a5d861c5ba31599084a42c7d92549f464dac':
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:15:03 +0000 (13:15 -0800)]
am
18a64b74: am
a887ff9a: am
4f74be57: am
1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '
18a64b74aa3cb0babb5f50e5f80660f601d80123':
stagefright aacenc: Simplify the definition of __inline
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:59 +0000 (13:14 -0800)]
am
6b4d7bad: am
f7210cf5: am
7346d73c: am
77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
* commit '
6b4d7bada0b1d34f93149211cb179b71c864d5d3':
stagefright amrwbenc: Remove a useless check
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:56 +0000 (13:14 -0800)]
am
2bf76b98: am
3e61e413: am
32901b39: am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:53 +0000 (13:14 -0800)]
am
484fc74b: am
4bcdeb86: am
716a0517: am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
484fc74beb79d0b8d49223cb3fce9e1ccbfd3501':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:48 +0000 (13:14 -0800)]
am
eb483de5: am
bf5c5e5b: am
c1da1e1b: am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:45 +0000 (13:14 -0800)]
am
5b299d2f: am
18643e70: am
6bc542e0: am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
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
Mathias Agopian [Sun, 26 Feb 2012 02:48:35 +0000 (18:48 -0800)]
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
Mathias Agopian [Sun, 26 Feb 2012 07:02:14 +0000 (23:02 -0800)]
split utils/threads.h into multiple headers
AndroidDefs.h - C/C++ enums and types
Mutex.h - Mutex class declaration
Condition.h - Condition class declaration
RWLock.h - RWLock class declaration
Thread.h - Thread class declaration
AndroidThreads.h - low-level thread creation functions
threads.h - includes all the above for backward source compatibility
Change-Id: Ia2f80c175333b59a41d1720985810bb2346e94cb
Note: implementations are still in Threads.cpp
Mathias Agopian [Sun, 26 Feb 2012 03:52:53 +0000 (19:52 -0800)]
libagl shouldn't export anything
Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
Mathias Agopian [Sun, 26 Feb 2012 03:44:35 +0000 (19:44 -0800)]
remove dummy libsurfaceflinger_client
Change-Id: Idd67a3f936deae7ba5d1cd5000d191fad271381e
Vikram Aggarwal [Mon, 27 Feb 2012 20:36:53 +0000 (12:36 -0800)]
Merge "affect -> effect and incorrect possessive"
Siva Velusamy [Mon, 27 Feb 2012 20:31:01 +0000 (12:31 -0800)]
Merge "gltrace: Make code 64-bit safe."
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"
Siva Velusamy [Mon, 27 Feb 2012 20:02:47 +0000 (12:02 -0800)]
gltrace: Make code 64-bit safe.
Currently, the trace API passes the pointers that need to be
patched up via 32 bit integers. Such code will not be 64 bit safe.
This patch sends all pointers in a separate array of pointers
for the fixup calls to read from.
Change-Id: If975333f11a6f6f9a74fba57de328affaed452a5
Daniel Lam [Mon, 27 Feb 2012 19:32:06 +0000 (11:32 -0800)]
Revert "Removed dependecies between BufferQueue and SurfaceTexture"
This reverts commit
a631399f71dbc7659d2f241968f85d337726ae61
Robert Ly [Mon, 27 Feb 2012 19:30:39 +0000 (11:30 -0800)]
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"
Robert Ly [Mon, 27 Feb 2012 16:49:04 +0000 (08:49 -0800)]
am
9dc8ea87: am
c76ca242: am
85cb9dec: Merge "docs: fix bug
5990526" into ics-mr1
* commit '
9dc8ea87b5016ca838373ff4996e9c92247aa224':
docs: fix bug
5990526
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 [Mon, 27 Feb 2012 15:51:10 +0000 (07:51 -0800)]
am
7a879da1: am
df154866: am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
7a879da1571027ef812b1322754f9c1daa378de1':
Xavier Ducrohet [Mon, 27 Feb 2012 15:51:05 +0000 (07:51 -0800)]
am
77fdcbff: am
f038868d: am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
77fdcbff8b458dd3430b38e60aee1a28ca92a738':
Support rendering layout that use the new res-auto namespace.
Siva Velusamy [Mon, 27 Feb 2012 15:41:38 +0000 (07:41 -0800)]
Merge "gltrace: attach buffer data sent with glBufferData"
Glenn Kasten [Mon, 27 Feb 2012 15:24:46 +0000 (07:24 -0800)]
Merge "Make threadLoop() logs identical"
Glenn Kasten [Mon, 27 Feb 2012 15:21:00 +0000 (07:21 -0800)]
Merge "Move declaration of mixerStatus to inner block"
Ben Murdoch [Mon, 27 Feb 2012 10:17:22 +0000 (02:17 -0800)]
Merge "Fix looping HTML5 Audio."
Jamie Gennis [Mon, 27 Feb 2012 01:06:42 +0000 (17:06 -0800)]
Merge "Removed dependecies between BufferQueue and SurfaceTexture"