summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Make default carrier name string look better." into lmp-mr1-devSanket Padawe2014-11-211-1/+1
|\
| * Make default carrier name string look better.Sanket Padawe2014-11-181-1/+1
* | Merge "It's super critical to call nStart" into lmp-mr1-devJohn Reck2014-11-212-8/+33
|\ \
| * | It's super critical to call nStartJohn Reck2014-11-212-8/+33
* | | Merge "Different messages when wiping user and not device" into lmp-mr1-devAmith Yamasani2014-11-212-0/+19
|\ \ \
| * | | Different messages when wiping user and not deviceAmith Yamasani2014-11-212-0/+19
* | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-devChris Craik2014-11-212-19/+0
|\ \ \ \
| * | | | Revert "Add a way to override Xfermode DO NOT MERGE"Chris Craik2014-11-212-19/+0
* | | | | Merge "Lightweight checkin output for network stats." into lmp-mr1-devJeff Sharkey2014-11-215-13/+137
|\ \ \ \ \
| * | | | | Lightweight checkin output for network stats.Jeff Sharkey2014-11-215-13/+137
* | | | | | resolved conflicts for merge of 694c1d2b to lmp-mr1-devJeff Brown2014-11-212-2/+54
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "Support keeping activities resumed while dozing." into lmp-sprout-devJeff Brown2014-11-212-2/+54
| |\ \ \ \ \ \
| | * | | | | | Support keeping activities resumed while dozing.Jeff Brown2014-11-202-2/+54
* | | | | | | | Merge "Improve GridLayout's weight calculations" into lmp-mr1-devYigit Boyar2014-11-211-24/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve GridLayout's weight calculationsYigit Boyar2014-11-191-24/+57
* | | | | | | | | Merge "Make default windows features configurable." into lmp-mr1-devBryce Lee2014-11-214-2/+34
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Make default windows features configurable.Bryce Lee2014-11-214-2/+34
* | | | | | | | | Merge "String literals for CL ag/586597" into lmp-mr1-devRubin Xu2014-11-212-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | String literals for CL ag/586597Rubin Xu2014-11-212-0/+26
* | | | | | | | | Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-devRuben Brunk2014-11-211-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Camera2: Doc updates for aeExposureCompensation.Ruben Brunk2014-11-201-0/+2
* | | | | | | | | Merge "Adding method to query backup manager service activity status" into lm...Zoltan Szatmary-Ban2014-11-211-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding method to query backup manager service activity statusZoltan Szatmary-Ban2014-11-121-0/+7
* | | | | | | | | | Merge "SwipeDismissLayout makes activity opaque only after entry animation en...Filip Gruszczynski2014-11-214-8/+92
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge "SwipeDismissLayout makes activity opaque only after entry animation en...Filip Gruszczynski2014-11-204-8/+92
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | SwipeDismissLayout makes activity opaque only after entry animation ends.Filip Gruszczynski2014-11-194-8/+92
| * | | | | | | | | am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-devDeepanshu Gupta2014-11-191-0/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-devDeepanshu Gupta2014-11-191-0/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | LayoutLib: Stub AM/PM keycodes in Time Picker.Deepanshu Gupta2014-11-181-0/+2
| * | | | | | | | | | | resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE)xinhe2014-11-195-1/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add configuration to control converting sms destination numberxinhe2014-11-185-0/+32
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-192-5/+5
| * | | | | | | | | | Frameworks/base: Compiled-classes supportAndreas Gampe2014-11-181-0/+16
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-173-420/+420
* | | | | | | | | | | Merge "Recents backup helper" into lmp-mr1-devChristopher Tate2014-11-212-0/+118
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Recents backup helperChristopher Tate2014-11-202-0/+118
* | | | | | | | | | | | Merge "Update scrollbars to match Material spec" into lmp-mr1-devAlan Viverette2014-11-2121-13/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update scrollbars to match Material specAlan Viverette2014-11-2021-13/+48
* | | | | | | | | | | | | Merge "Update overflow menu alignment to match spec" into lmp-mr1-devAlan Viverette2014-11-212-8/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update overflow menu alignment to match specAlan Viverette2014-11-202-8/+12
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_P...Dianne Hackborn2014-11-211-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSIONDianne Hackborn2014-11-201-1/+25
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-devAlan Viverette2014-11-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make DeviceDefault alert dialog themes publicAlan Viverette2014-11-201-0/+3
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-devErik Kline2014-11-211-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Rename EXTRA_NETWORK ConnectivityManager constants.Erik Kline2014-11-201-5/+4
* | | | | | | | | | | | | | Merge "If the surface is lost, release it" into lmp-mr1-devJohn Reck2014-11-212-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | If the surface is lost, release itJohn Reck2014-11-202-1/+2
* | | | | | | | | | | | | | | Merge "Rename callDrawGLFunction" into lmp-mr1-devJohn Reck2014-11-203-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename callDrawGLFunctionJohn Reck2014-11-203-6/+3
| |/ / / / / / / / / / / / / /