summaryrefslogtreecommitdiffstats
path: root/api/12.xml
Commit message (Collapse)AuthorAgeFilesLines
* Use the new API file format, and some minor tweaks to the old XML files that ↵Joe Onorato2011-04-081-6/+6
| | | | | | make the parser easier. Change-Id: I9307d0d323f1b65816b3e097bf9c4d92f3962b2f
* final 12.xml from gingerbread.Joe Onorato2011-04-071-19/+59
| | | | Change-Id: I6089b57a22e7d9eaa43979ce8e9990192c83203d
* Tracking merge of dalvik-dev to masterBrian Carlstrom2011-04-011-42/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit a80febd83c8bf0b6717da2a7136179bdc906a5b7 git cherry-pick --no-commit 5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd git cherry-pick --no-commit 4886db14c9eee4b6fee69bd54c57c5af04709c4c git cherry-pick --no-commit 560c685e448769904047507b9484ce8111967d7e git cherry-pick --no-commit 63dde7a2fcfa53dc531558635b64cea613d3cdb4 git cherry-pick --no-commit 74e5cb91060a379d98dd3a333b5f231bfb4f502e git cherry-pick --no-commit 1cc8c9708b555e2e338b7798d38887a2fefcfea6 git cherry-pick --no-commit 09625a21f5abe0c0db15757f58585d552d62c3d7 git cherry-pick --no-commit fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458 git cherry-pick --no-commit a68cb7fa3ab42854768b8145ff85231663770292 git cherry-pick --no-commit 716beb1c131dd2c6b805d4f681debaa20075010c git cherry-pick --no-commit 8c29b1097a7afe3a77e27546a56e396f3620a4ec git cherry-pick --no-commit 9c6a1a55d1c8086c1cc57464eea43725694ff70c git cherry-pick --no-commit b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8 Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
* am b6955be9: am b382a054: am 8dcd6647: Merge "Now have a final API 12." into ↵Dianne Hackborn2011-03-221-18/+5756
|\ | | | | | | | | | | | | honeycomb-mr1 * commit 'b6955be94a065f34275cc20161664871bd286f75': Now have a final API 12.
| * Now have a final API 12.Dianne Hackborn2011-03-221-18/+5756
| | | | | | | | Change-Id: I7475ed7f82e4875c7e51671703821e5735dc1433
* | am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one ↵Gloria Wang2011-03-171-2/+0
|\ \ | |/ | | | | | | | | | | more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 * commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707': Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
| * Fix for 4089881.Gloria Wang2011-03-161-2/+0
| | | | | | | | | | | | | | | | - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
| * Deprecating webkit API's that might not be supported in the future do not mergeKristian Monsen2011-03-071-17/+17
|/ | | | Change-Id: I7ed9498a24aceee529397bbe1ed96a15f834b4eb
* Remove default constructors from static utility classes.Jesse Wilson2011-02-241-48/+0
| | | | | Change-Id: Id8dc55a30a03e1da87500b66c429de9268033b9e http://b/3344646
* Hiding deprecated classes and methodsKristian Monsen2011-02-231-0/+456368
These have been deprecated for more than a yearm so hiding them. Note that this CL was approved in honeycomb, but moved to MR1: https://android-git.corp.google.com/g/#change,89487