Jean-Michel Trivi
98805bf7ee
Merge "Add channel mask in AudioSink"
2012-03-05 14:51:54 -08:00
Tom Taylor
5ea4707939
Merge "Remove deleted pdu items from the updated cache"
2012-03-05 14:47:27 -08:00
Scott Main
cd365a8ee9
am 5186f094: am 8b0f6881: am a47d88a7: docs: dashboard update for march 5
...
* commit '5186f094ba6d37f47ae52085e34dd87267ec41d4':
docs: dashboard update for march 5
2012-03-05 14:43:11 -08:00
Fabrice Di Meglio
180d116a38
Merge "Fix bug #5815381 [DA] [Android Gallery] [Cut string in "no-response" box]"
2012-03-05 14:40:50 -08:00
Scott Main
8dfeb57ef2
am 8b0f6881: am a47d88a7: docs: dashboard update for march 5
...
* commit '8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
2012-03-05 14:39:46 -08:00
Scott Main
d4d5f8e8bb
am a47d88a7: docs: dashboard update for march 5
...
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
2012-03-05 14:36:05 -08:00
Jim Miller
013580c27c
Merge "Fix 5958806: Allow play button to be hidden in TransportControlView"
2012-03-05 13:50:48 -08:00
Romain Guy
7e17bd0760
Merge "Delete display list objects and resources on the UI thread Bug #6073717 Bug #6065504 Bug #6026515 Bug #5971725 "
2012-03-05 13:48:55 -08:00
Jeff Brown
e68e91bf1b
Merge "Make SQLiteDatabase final."
2012-03-05 13:38:59 -08:00
Jeff Brown
51c9e44bf1
Merge "Don't log SQLITE_SCHEMA errors."
2012-03-05 13:38:24 -08:00
Fabrice Di Meglio
bd41735e5d
Merge "Fix bug #6029615 Update Javadoc for onPaddingChanged()"
2012-03-05 13:36:20 -08:00
Scott Main
5e35ba5eb7
am 7342817e: am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '7342817ec382ad45dffdf48ad34e0805ed026a2a':
2012-03-05 13:35:05 -08:00
Scott Main
3191c0a5e5
am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit 'afdf856d432fe5bae56152e42cb2c28ba63a5af0':
2012-03-05 13:32:20 -08:00
Scott Main
e44ea4edc0
am 2814c8be: am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '2814c8be993ddfb2c64b0dcbeb1443427b3fca3d':
docs: add note about declaring file sizes with sample app's code
2012-03-05 13:30:15 -08:00
Scott Main
10c20275b9
am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '97aa69d32f52499db001970829a0e654564ea551':
docs: add note about declaring file sizes with sample app's code
2012-03-05 13:27:33 -08:00
Scott Main
bac61a9acc
am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
2012-03-05 13:26:26 -08:00
Scott Main
5426ffb8bf
am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
2012-03-05 13:25:54 -08:00
Romain Guy
d0415d07f0
Merge "Deferred layer updates"
2012-03-05 13:20:46 -08:00
Dima Zavin
75657b63b6
Merge "PowerManagerService: only turn off screen when we really mean to"
2012-03-05 13:19:33 -08:00
Glenn Kasten
16165db5d6
Merge "threadLoop merge"
2012-03-05 12:18:14 -08:00
Mathias Agopian
11f05b0113
Merge "BufferQueue: fixed acquire operation"
2012-03-05 12:09:45 -08:00
Scott Main
29f3ddf0e0
am 668f8125: am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '668f8125bb7e72780ee204278e4d0da189b8a4b3':
2012-03-05 11:58:52 -08:00
Scott Main
fadf954f56
am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit 'a7368087d6f1f2682174139d9cacab48dc7bc198':
2012-03-05 11:56:48 -08:00
Scott Main
4673ff0e85
am 6c4faf74: am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6c4faf74ae45ebd705620144150acfb677844523':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:56:43 -08:00
Scott Main
8c416dccbc
am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:54:36 -08:00
Scott Main
428048b5b5
am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:52:59 -08:00
Scott Main
63d0b17f25
am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:52:41 -08:00
Scott Main
f9f509db1e
Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
2012-03-05 11:51:03 -08:00
Dianne Hackborn
271fddfb84
Merge "More work on rotation animation."
2012-03-05 11:45:19 -08:00
John Reck
14272bb4f4
Merge "Delete more navcache stuff"
2012-03-05 11:33:44 -08:00
Jeff Sharkey
61ba9f3221
Merge "Report leaked Context registrations to StrictMode."
2012-03-05 10:49:11 -08:00
Scott Main
f34e525abd
am 79003f35: am bde31762: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '79003f35945fbbb0c55c23e8fd33085c4f129423':
2012-03-05 10:12:15 -08:00
Scott Main
6a6850f15a
am dc022a6f: am 08e91352: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit 'dc022a6f9aa30d9282c4f82c1cc4d1c8bde7e808':
docs: fix misc bugs from external tracker
2012-03-05 10:09:44 -08:00
Scott Main
6b47c42ee5
am bde31762: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit 'bde31762f989acbfde92e8f47ceea780cacc4e7a':
2012-03-05 10:08:54 -08:00
Scott Main
8466f6240b
am 08e91352: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '08e91352169457ac86a2465e4db867971ce14b10':
docs: fix misc bugs from external tracker
2012-03-05 10:07:47 -08:00
Scott Main
507c562517
am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
2012-03-05 10:06:04 -08:00
Scott Main
b324522cce
am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
2012-03-05 10:06:00 -08:00
Michael Kolb
91cef48fe4
Merge "fix race condition in WebViewClassic.destroy()"
2012-03-05 09:16:35 -08:00
Alex Sakhartchouk
2e926c2454
Merge "Add multisampling support to renderscript."
2012-03-05 08:30:31 -08:00
Alex Sakhartchouk
56e561b1b8
Merge "Using surface texture as a default renderscript surface."
2012-03-05 08:29:57 -08:00
Jeff Sharkey
c0cc1c7af1
Merge "Allow disk I/O while performing dump()."
2012-03-02 18:07:35 -08:00
James Dong
a01581c57a
Merge "Fix some JNI issues in the drm framework"
2012-03-02 17:12:24 -08:00
Mike Lockwood
d0e2b8e57c
Merge "Fix incorrect javadoc"
2012-03-02 17:02:18 -08:00
The Android Open Source Project
9b03aa5092
am c071d874: am 37d6d98f: Reconcile with ics-mr1-release
...
* commit 'c071d874386564832ba0b4a87242fb786f96764c':
2012-03-02 16:51:22 -08:00
Scott Main
8ef7c9e90e
am 80bc2bf7: am cc902c78: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
...
* commit '80bc2bf70571aee54eb3265f41260190fe904b6e':
2012-03-02 16:48:36 -08:00
The Android Open Source Project
9d3920e9cc
am 37d6d98f: Reconcile with ics-mr1-release
...
* commit '37d6d98fe3ea739627e03b78196faba55b427503':
2012-03-02 16:48:24 -08:00
Scott Main
e5d98e703c
am a9fae13e: am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
...
* commit 'a9fae13e81fe8211b95bd55a42f3a9b612adfe48':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:45:44 -08:00
Scott Main
08e9495b8e
am cc902c78: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
...
* commit 'cc902c78e41549749ad98d96530bef25a3aeae47':
2012-03-02 16:44:21 -08:00
The Android Open Source Project
2df5656cfb
Reconcile with ics-mr1-release
...
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
2012-03-02 16:43:42 -08:00
Scott Main
aabf4ecde2
am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
...
* commit '9ad705ce0b8271931f9a09d181069c7466afade4':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:42:36 -08:00