summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-1413-288/+664
* AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-144-49/+431
* Merge "frameworks/base: move idmap from frameworks/native"Dianne Hackborn2014-02-146-0/+1056
|\
| * frameworks/base: move idmap from frameworks/nativeColin Cross2014-02-116-0/+1056
* | Merge "Telephony: Handle DATA_CALL_LIST in DCC."Wink Saville2014-02-131-0/+1
|\ \
| * | Telephony: Handle DATA_CALL_LIST in DCC.Yashdev Singh2014-01-151-0/+1
* | | Merge "Telephony API extension v2"Wink Saville2014-02-1314-10/+1351
|\ \ \
| * | | Telephony API extension v2Antonio Marín Cerezuela2014-01-1014-10/+1351
* | | | Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-121-1/+1
|\ \ \ \
| * | | | Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-071-1/+1
* | | | | Merge "Finish fixing Zygote descriptor leakage problem"Dave Platt2014-02-122-1/+45
|\ \ \ \ \
| * | | | | Finish fixing Zygote descriptor leakage problemDave Platt2014-02-062-1/+45
* | | | | | Merge "Fix build."Narayan Kamath2014-02-121-2/+2
|\ \ \ \ \ \
| * | | | | | Fix build.Dianne Hackborn2014-02-121-2/+2
* | | | | | | Merge "Improve Parcel's handling of non-primitive arrays"Paul Duffin2014-02-121-8/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improve Parcel's handling of non-primitive arraysPaul Duffin2014-02-111-8/+13
* | | | | | | Merge "Use size_t* in AssetManager::createIdmap"Narayan Kamath2014-02-122-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Use size_t* in AssetManager::createIdmapColin Cross2014-02-112-2/+2
|/ / / / / /
* | | | | | Merge "Runtime resource overlay, iteration 2, test cases"Dianne Hackborn2014-02-1129-206/+1298
|\ \ \ \ \ \
| * | | | | | Runtime resource overlay, iteration 2, test casesMårten Kongstad2014-02-0329-206/+1298
* | | | | | | Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-02-1116-220/+535
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-0316-220/+535
* | | | | | | Merge "New command line tool 'idmap'"Dianne Hackborn2014-02-114-3/+57
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | New command line tool 'idmap'Mårten Kongstad2014-02-034-3/+57
* | | | | | Merge "Use long to store pointers in GLES_JNI/EGL classes"Narayan Kamath2014-02-116-90/+113
|\ \ \ \ \ \
| * | | | | | Use long to store pointers in GLES_JNI/EGL classesAshok Bhat2014-01-316-90/+113
* | | | | | | Merge "Fix in MediaMuxer's JNI code"Narayan Kamath2014-02-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Use long to store pointers in ConsumerIrService"Narayan Kamath2014-02-112-19/+19
|\ \ \ \ \ \ \
| * | | | | | | Use long to store pointers in ConsumerIrServiceAshok Bhat2014-02-072-19/+19
| |/ / / / / /
* | | | | | | Merge "Use long for pointers in EmojiFactory and PdfDocument"Narayan Kamath2014-02-114-53/+53
|\ \ \ \ \ \ \
| * | | | | | | Use long for pointers in EmojiFactory and PdfDocumentAshok Bhat2014-01-314-53/+53
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"Narayan Kamath2014-02-111-4/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix TinyHashMap to use generic hash_type instead of hash_tAshok Bhat2014-02-071-4/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Generic object based data copy."Tim Murray2014-02-101-234/+247
|\ \ \ \ \ \ \
| * | | | | | | Generic object based data copy.Jason Sams2014-02-101-234/+247
| |/ / / / / /
* | | | | | | Merge "frameworks/base: fix errors inside ALOGV"Colin Cross2014-02-102-2/+2
|\ \ \ \ \ \ \
| * | | | | | | frameworks/base: fix errors inside ALOGVColin Cross2014-02-092-2/+2
* | | | | | | | Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath2014-02-108-87/+96
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | AArch64: Use long for pointers in RS Java/JNI codeAshok Bhat2014-02-058-87/+96
* | | | | | | | Merge "Use canonical path for /vendor/app"Christopher Tate2014-02-071-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Use canonical path for /vendor/appJohan Redestig2014-01-301-0/+5
* | | | | | | | | Merge "Example controller app for system ui demo mode."John Spurlock2014-02-074-0/+411
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Example controller app for system ui demo mode.John Spurlock2014-02-074-0/+411
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Fix a typo."Jean-Luc Brouillet2014-02-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a typo.Jean-Luc Brouillet2014-02-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge "Make sure to turn off led after pulse()"Dan Sandler2014-02-071-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make sure to turn off led after pulse()Oskar Andero2014-01-241-0/+1
* | | | | | | | | Merge "Fix for positioning of glyphs within a bitmap"Chris Craik2014-02-051-3/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix for positioning of glyphs within a bitmapAlexander Toresson2014-01-231-3/+3
| |/ / / / / / /