Jason Sams
|
04f3a53f96
|
Merge "More RS cpp binding work. All classes for compute should be partially implemented at this time."
|
2012-02-23 18:20:00 -08:00 |
|
Xavier Ducrohet
|
9002000696
|
Merge "Move the automatic namespace outside of the res namespace."
|
2012-02-23 18:08:13 -08:00 |
|
Romain Guy
|
68847fe083
|
Merge "Only recreate path textures when necessary"
|
2012-02-23 17:11:49 -08:00 |
|
Alex Sakhartchouk
|
875c67a596
|
Merge "Adding a few more howto elements to scenegraph example."
|
2012-02-23 16:57:00 -08:00 |
|
George Mount
|
f35ed374b3
|
Merge "Add javascript key events for special characters."
|
2012-02-23 14:43:02 -08:00 |
|
Joe Fernandez
|
1719dcef02
|
am fad35e3b: am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit 'fad35e3b9190c25700c62cc1c4b3d369f5d42a60':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
|
2012-02-23 14:31:38 -08:00 |
|
Joe Fernandez
|
875401d5be
|
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)
|
2012-02-23 14:28:07 -08:00 |
|
Joe Fernandez
|
bf0139e189
|
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)
|
2012-02-23 14:25:01 -08:00 |
|
Joe Fernandez
|
2ea80d5afa
|
Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
|
2012-02-23 14:22:41 -08:00 |
|
Jason Sams
|
d49c74b0f6
|
Merge "start new headers"
|
2012-02-23 14:19:43 -08:00 |
|
James Dong
|
4aeabc1249
|
Merge "Fix memory leakage due to unreleased MuxOMX objects after disconnection"
|
2012-02-23 14:17:39 -08:00 |
|
Romain Guy
|
65a01f6227
|
Merge "Perform early intersect to avoid unnecessary draws"
|
2012-02-23 13:53:47 -08:00 |
|
John Reck
|
52a9ef6cbe
|
Merge "Support mIntentUrl for addresses"
|
2012-02-23 13:40:25 -08:00 |
|
Eric Fischer
|
0823ff5b56
|
Merge "Import translations. DO NOT MERGE"
|
2012-02-23 13:17:10 -08:00 |
|
Jean-Baptiste Queru
|
064da449c4
|
am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '0842a2262d03fc98e42541cb38f51a341d346ae0':
Fix for issue 9656 - custom xml attributes in Android Libraries
|
2012-02-23 13:04:24 -08:00 |
|
Jean-Baptiste Queru
|
32776d7222
|
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
|
2012-02-23 13:01:59 -08:00 |
|
Jean-Baptiste Queru
|
2ffe39d2a2
|
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
|
2012-02-23 12:59:22 -08:00 |
|
Jean-Baptiste Queru
|
df8604cb86
|
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
|
2012-02-23 12:57:03 -08:00 |
|
Jean-Baptiste Queru
|
0025dd37f5
|
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
|
2012-02-23 12:38:14 -08:00 |
|
Michael Jurka
|
ae31099c8a
|
am 08cb8352: am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '08cb8352ef208730e4e3e1e71ebc47a59f0363de':
|
2012-02-23 12:26:18 -08:00 |
|
Michael Jurka
|
a9ed27db31
|
am 6ad5d69d: am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '6ad5d69da5cff2e4b5fb7acdb2699e2315b83307':
Don't allow screen invalidations to go outside bounds of screen
|
2012-02-23 12:26:16 -08:00 |
|
Scott Main
|
480bfe4284
|
am 8857f669: am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '8857f669f902acd5f3763ea65b023a0987e6ea0e':
|
2012-02-23 12:26:01 -08:00 |
|
Scott Main
|
a12923ce2e
|
am cb4ebcb2: am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit 'cb4ebcb20b8540cc8027ae03dd578ce3846e9af1':
docs: fix broken link
|
2012-02-23 12:25:53 -08:00 |
|
Xavier Ducrohet
|
057aff9e49
|
am 3c84c30a: am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '3c84c30a8605b56d63847081eaba79562dc1fa83':
|
2012-02-23 12:25:46 -08:00 |
|
Jean-Baptiste Queru
|
a4a60e8022
|
am 9379ac38: (-s ours) am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
* commit '9379ac3878f8ef104eb540566048d56577004190':
Add stubs for improved compatibility
|
2012-02-23 12:25:44 -08:00 |
|
Xavier Ducrohet
|
109abeab75
|
am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
Make sure resource references are resolved.
|
2012-02-23 12:22:40 -08:00 |
|
Jean-Baptiste Queru
|
bd16dd1b38
|
am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
Xcode 4.3 compatibility checkin
|
2012-02-23 12:22:35 -08:00 |
|
Jean-Baptiste Queru
|
98c14afd77
|
am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"
* commit '9f207a850f6c5744db895692f21159d9a88966c5':
The bigger touch slop still has a problem
|
2012-02-23 12:22:29 -08:00 |
|
Andreas Huber
|
2f09c03ce8
|
Merge "Be more greedy when it comes to gathering input and output buffers."
|
2012-02-23 11:54:08 -08:00 |
|
Adam Powell
|
e602c17a5a
|
Merge "Bug 6058721 - optimize changing checked states in AbsListView"
|
2012-02-23 11:49:05 -08:00 |
|
Rich Hyndman
|
70e83d732c
|
am 46074f4d: am 3ebde8a2: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '46074f4d4aa8334249a9bd71e6d0bc25066d5cae':
|
2012-02-23 11:20:43 -08:00 |
|
Rich Hyndman
|
7166a0514c
|
am f2381328: am 22c98df9: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit 'f238132853d2482979ec98a9d4f81ea24273768d':
docs: Added Lint into Android Training and removed Layoutopt.
|
2012-02-23 11:20:40 -08:00 |
|
The Android Open Source Project
|
e21d284dd9
|
am d4c617ae: am 41cea4b5: Reconcile with ics-mr1-release
* commit 'd4c617aed18ba4080c773ff40a2b0f75b4a73645':
|
2012-02-23 11:20:36 -08:00 |
|
The Android Open Source Project
|
11750bb98b
|
am f815dc4e: am 64a907c5: Reconcile with ics-mr1-release
* commit 'f815dc4e4a09ec53f183a391495ef87dd21ccc6f':
|
2012-02-23 11:20:30 -08:00 |
|
The Android Open Source Project
|
270d627166
|
am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release
* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':
|
2012-02-23 11:20:16 -08:00 |
|
The Android Open Source Project
|
7f114ff553
|
am 5cfee77e: am 8013fd39: Reconcile with ics-mr1-release
* commit '5cfee77e400a6e1f51b37e03ce090bc233f1bb8a':
|
2012-02-23 11:19:58 -08:00 |
|
Dianne Hackborn
|
540ca9f571
|
am 536a3b18: am f08beab2: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded
* commit '536a3b185bb0a2f7bc11b78e00123ee502c99f2f':
|
2012-02-23 11:19:50 -08:00 |
|
Dianne Hackborn
|
928bf551a0
|
resolved conflicts for merge of 210c1a26 to master
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
|
2012-02-23 10:54:06 -08:00 |
|
Dianne Hackborn
|
72d43f421a
|
Merge "Fix issue #6049410: 3rd party app crashing in JB: Uber"
|
2012-02-23 10:45:11 -08:00 |
|
Stephen Hines
|
1e91d2ac88
|
Merge "Support running ForEach on non-root functions."
|
2012-02-23 09:58:56 -08:00 |
|
Gilles Debunne
|
823099ee09
|
Merge "Updated min/maxLines and singleLine documentation"
|
2012-02-23 09:26:25 -08:00 |
|
Andreas Huber
|
a3b42cdae7
|
Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass"
|
2012-02-23 09:13:45 -08:00 |
|
Jean-Baptiste Queru
|
f7ab0a3eb6
|
am ad3102d0: am f3d94b44: am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit 'ad3102d06bc6060f739e0803d0e45dec8020703b':
Call onTimeChanged when AM/PM changed.
|
2012-02-23 08:35:03 -08:00 |
|
Tsu Chiang Chuang
|
f6611b1e17
|
am 7b306ae2: am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '7b306ae225b0a7337972f4d8bff51e8f79be3a03':
|
2012-02-23 08:34:56 -08:00 |
|
Tsu Chiang Chuang
|
7751c440ca
|
am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit 'c16d9de72996950ec7f55af80d2864cd2abad1c2':
fix NPE in race condition.
|
2012-02-23 08:34:44 -08:00 |
|
Michael Jurka
|
13fd6d8c7b
|
am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'a7e1d8d5f7d16cd1004189f9aee727962790b8bf':
|
2012-02-23 08:11:45 -08:00 |
|
Michael Jurka
|
2405294349
|
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
|
2012-02-23 08:09:59 -08:00 |
|
Michael Jurka
|
1836a969f8
|
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
|
2012-02-23 08:07:51 -08:00 |
|
Michael Jurka
|
2c672d6546
|
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
|
2012-02-23 08:07:22 -08:00 |
|
Adam Powell
|
48bcb4be7b
|
am 49913d8c: am 8035db11: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '49913d8c60a2add8989435bcda532959e86f99b1':
|
2012-02-23 07:30:09 -08:00 |
|