ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,373 Commits 2 Branches 0 Tags 54 MiB
85b217668d
Commit Graph

46373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Main
ab5c23bedc 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 '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  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:40:21 -08:00
Scott Main
a421bf78ac 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 '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  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:40:00 -08:00
The Android Open Source Project
382929939e am 55208109: am 3e72c93b: Reconcile with ics-mr1-release 
* commit '552081091de745d5fc1114314fd0cccecfc3f38c':
 2012-03-02 16:39:54 -08:00
The Android Open Source Project
aba282c4e1 am 3e72c93b: Reconcile with ics-mr1-release 
* commit '3e72c93b1652ec021fa0965e432b508b847b2b74':
 2012-03-02 16:35:27 -08:00
Irfan Sheriff
2bac948df9 Merge "Enhance WPS" 2012-03-02 16:33:01 -08:00
The Android Open Source Project
0a6fc120aa Reconcile with ics-mr1-release 
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
 2012-03-02 16:32:56 -08:00
Craig Mautner
cdc3a83cad Merge "Fix rotation so orientation changes aren't dropped. Modify test so that rotation animation is entered one final time after rotation completes. This last time causes mUpdateRotation to be set true forcing a test for orientation change. Fixes bug 6109189." 2012-03-02 16:06:33 -08:00
John Reck
e058458135 Merge "Fix flash" 2012-03-02 15:37:53 -08:00
Svetoslav Ganov
81f159fdcd Merge "Sync of the NumberPicker attributes with the public Java APIs" 2012-03-02 15:33:33 -08:00
Svetoslav Ganov
38193e2a4e Merge "Sync of the TimePicker attributes with the public Java APIs." 2012-03-02 15:33:20 -08:00
Svetoslav Ganov
9f306f1d48 Merge "Fixing the build for real." 2012-03-02 14:57:42 -08:00
Irfan Sheriff
2b3093e819 Merge "Fix connect on a network id with zero" 2012-03-02 14:48:51 -08:00
Svetoslav Ganov
e16e043175 Merge "Fixing the build" 2012-03-02 14:45:58 -08:00
Svetoslav Ganov
ae0415618d Merge "Sync of the DatePicker attributes with the public Java APIs." 2012-03-02 14:03:16 -08:00
Glenn Kasten
9bbb5c27c6 Merge "Fix typos and line length in AudioRecord comments" 2012-03-02 13:48:35 -08:00
Svetoslav Ganov
91fd58c7fb Merge "Adding getter/setter for all public attributes in CalendarView." 2012-03-02 13:12:22 -08:00
Robert Greenwalt
91b9c8eb6c Merge "Fix the bug net.dns1.pid is same as net.dns2.pid" 2012-03-02 12:00:50 -08:00
The Android Automerger
94083a1398 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:51:23 -08:00