summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-2727-447/+406
* Merge "Add a mediastore constant for playlists."Matt Casey2014-03-271-0/+4
|\
| * Add a mediastore constant for playlists.Matt Casey2014-03-261-0/+4
* | Merge "Move legacy notification processing to Notification.Builder"Jorim Jaggi2014-03-274-24/+465
|\ \
| * | Move legacy notification processing to Notification.BuilderJorim Jaggi2014-03-274-24/+465
* | | Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register."Matt Casey2014-03-271-0/+5
|\ \ \
| * | | Update doc for ACTION_HEADSET_PLUG to mention explicit register.Matt Casey2014-03-261-0/+5
* | | | am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: init...Kenny Root2014-03-271-1/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustM...Kenny Root2014-03-271-1/+10
| |\ \ \
| | * | | CertificateChainValidator: initialize TrustManagerFactoryKenny Root2014-03-261-1/+10
| * | | | am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setPa...Eino-Ville Talvala2014-03-251-4/+26
| |\ \ \ \
| | * \ \ \ am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ...Eino-Ville Talvala2014-03-251-4/+26
| | |\ \ \ \
| | | * \ \ \ am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS s...Eino-Ville Talvala2014-03-251-4/+26
| | | |\ \ \ \
| | | | * \ \ \ Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range v...Eino-Ville Talvala2014-03-251-4/+26
| | | | |\ \ \ \
| | | | | * | | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-221-4/+26
* | | | | | | | | Merge "Revert "Support for new gTLDs""Selim Gurun2014-03-261-78/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Support for new gTLDs"Selim Gurun2014-03-261-78/+69
* | | | | | | | | | Revert "Don't prompt at boot if we already did that when decrypting"Paul Lawrence2014-03-263-74/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge "Support for new gTLDs"Selim Gurun2014-03-261-69/+78
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Support for new gTLDsSelim Gurun2014-03-211-69/+78
* | | | | | | | | Merge "Revert "Expand install observer semantics""Glenn Kasten2014-03-266-287/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Expand install observer semantics"Glenn Kasten2014-03-266-287/+11
* | | | | | | | | | Merge "Fix attribute extraction, use color attrs in Quantum drawables"Alan Viverette2014-03-261-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix attribute extraction, use color attrs in Quantum drawablesAlan Viverette2014-03-261-3/+2
* | | | | | | | | | | Merge "Expand install observer semantics"Christopher Tate2014-03-266-11/+287
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Expand install observer semanticsChristopher Tate2014-03-256-11/+287
* | | | | | | | | | Merge "Zen mode updates."John Spurlock2014-03-261-6/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Zen mode updates.John Spurlock2014-03-261-6/+3
* | | | | | | | | | | Merge "Add private circular reveal API on View/RenderNode"Chris Craik2014-03-262-1/+22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add private circular reveal API on View/RenderNodeChris Craik2014-03-252-1/+22
* | | | | | | | | | | Merge "Wrong constant used for undefined accessibility window id."Svetoslav2014-03-261-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Wrong constant used for undefined accessibility window id.Svetoslav2014-03-251-2/+3
* | | | | | | | | | | | am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTr...Kenny Root2014-03-254-34/+387
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"Kenny Root2014-03-254-34/+387
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Use X509ExtendedTrustManager and not ConscryptKenny Root2014-03-244-34/+387
| * | | | | | | | | | | am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes...Gabriel Peal2014-03-251-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s...Gabriel Peal2014-03-251-0/+31
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 83da75d9: Added a private apis jar that includes explicitly supported APIs...Gabriel Peal2014-03-221-0/+31
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | * | | | | | | | Added a private apis jar that includes explicitly supported APIs that are not...Gabriel Peal2014-03-221-0/+31
| * | | | | | | | | | | am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-m...John Spurlock2014-03-241-50/+77
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Unhide Notification kind, rename to category." into klp-modular-devJohn Spurlock2014-03-241-50/+77
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Unhide Notification kind, rename to category.John Spurlock2014-03-241-50/+77
* | | | | | | | | | | | | Merge "Camera2: Add partial flash state"Zhijun He2014-03-252-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Camera2: Add partial flash stateZhijun He2014-03-252-13/+13
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Shared library resource supportAdam Lesinski2014-03-258-22/+132
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "resolved conflicts for merge of 74fb97de to master"Gabriel Peal2014-03-251-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | resolved conflicts for merge of 74fb97de to masterGabriel Peal2014-03-251-0/+31
* | | | | | | | | | | | | Merge "Fix doc build"Chris Craik2014-03-251-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix doc buildChris Craik2014-03-251-2/+3
* | | | | | | | | | | | | | Merge "Move where updateProperties is called"John Reck2014-03-251-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |