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

46353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Lam
3fcee50ffa BufferQueue: fixed acquire operation 
Bug: 6082872
Change-Id: I897dc61eb84fed953e51f97871cd3ae6321505d4
 2012-03-02 11:30:56 -08:00
Alon Albert
25fb205952 Merge "Add a displayColor column to view_events" 2012-03-02 11:25:54 -08:00
Jeff Brown
a0c50b5cc7 Merge "Add an API for deleting databases." 2012-03-02 11:15:41 -08:00
Jeff Brown
b12501da15 Merge "Adjust WAL checkpoint interval." 2012-03-02 11:15:28 -08:00
Jean-Michel Trivi
e117b1462b Merge "Correct GUID errors in audio effect configuration" 2012-03-02 11:11:05 -08:00
James Dong
88c2ba76ce Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes" 2012-03-02 11:01:27 -08:00
Martijn Coenen
00b5eabe3c Merge "Hidden API for setting p2p NFC modes." 2012-03-02 10:13:07 -08:00
Teng-Hui Zhu
cdbbb51783 Merge "Make sure egl context is valid for the onTrimMemory call" 2012-03-02 09:41:14 -08:00
Robert Ly
a5304a0dae am 4c7992e9: am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '4c7992e9d2fc0c73c938cd3d06da27fc6a3efe00':
 2012-03-02 09:14:33 -08:00
Robert Ly
8244fc6ce7 am b962b98b: am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'b962b98bef33eba634aec41cf9d84527ce9db3bb':
  docs: fixing bug 5942573
 2012-03-02 09:11:54 -08:00
Robert Ly
174e348039 am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'd559bc79d546f1b448cc43851de5f43babc81795':
 2012-03-02 09:10:22 -08:00
Robert Ly
34f58c8b8a am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '67a15457d184f01fffe162a0983d0b507cb7b358':
  docs: fixing bug 5942573
 2012-03-02 09:09:30 -08:00
Robert Ly
b88b34907b am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
4b8c531487 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
81c173f348 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
George Mount
acf2581ff6 Merge "Quick fix for Monkey NPE." 2012-03-02 08:43:43 -08:00
Dianne Hackborn
f737be5495 am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'd4202c9d138459a60fde708ecda995f3b599d252':
 2012-03-02 08:42:22 -08:00
Dianne Hackborn
35fbc7c0cc am 5d87d51f: am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '5d87d51fab7e17793413c9095028963117e276b8':
  Make ResolverActivity update dynamically.
 2012-03-02 08:39:39 -08:00
Dianne Hackborn
57d94bc9ae am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '921e83039d266b6d288fd5e09160d878eccb9e23':
 2012-03-02 08:37:48 -08:00
Dianne Hackborn
e8f6cdb6c1 am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'f65951bf5db7a248651cbfa89886d773f95c3e03':
  Make ResolverActivity update dynamically.
 2012-03-02 08:36:05 -08:00