summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Ensure calling mutate() on DrawableContainer creates a new state" into...Alan Viverette2014-11-255-37/+81
|\
| * Ensure calling mutate() on DrawableContainer creates a new stateAlan Viverette2014-11-255-37/+81
* | Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into...Eric Laurent2014-11-251-2/+2
|\ \
| * | AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.Eric Laurent2014-11-181-2/+2
* | | Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-devRoozbeh Pournader2014-11-252-0/+8
|\ \ \
| * | | Add Lohit Odia (Oriya) font to the fallback chain.Roozbeh Pournader2014-11-242-0/+8
* | | | Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1...Lajos Molnar2014-11-251-4/+4
|\ \ \ \
| * | | | media: add support for 160-byte image info in MediaCodecLajos Molnar2014-11-241-4/+4
* | | | | Merge "Add flag for wiping factory reset protection data." into lmp-mr1-devPaul Crowley2014-11-253-23/+40
|\ \ \ \ \
| * | | | | Add flag for wiping factory reset protection data.Paul Crowley2014-11-253-23/+40
| |/ / / /
* | | | | Merge "Adding helper functions to retrieve settings that are stored per subId...Amit Mahajan2014-11-252-2/+50
|\ \ \ \ \
| * | | | | Adding helper functions to retrieve settings that are stored per subId.Amit Mahajan2014-11-242-2/+50
| | |/ / / | |/| | |
* | | | | Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-devJohn Reck2014-11-251-1/+2
|\ \ \ \ \
| * | | | | Force-use the pbuffer surface for destroyJohn Reck2014-11-251-1/+2
* | | | | | Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1...Jorim Jaggi2014-11-255-17/+102
|\ \ \ \ \ \
| * | | | | | Animate notifs depending on touch when exiting doze modeJorim Jaggi2014-11-255-17/+102
* | | | | | | Merge "DevicePolicy: Don't warn about managed profile CAs" into lmp-mr1-devRobin Lee2014-11-251-4/+8
|\ \ \ \ \ \ \
| * | | | | | | DevicePolicy: Don't warn about managed profile CAsRobin Lee2014-11-251-4/+8
* | | | | | | | Merge "Improve DisplayList state output" into lmp-mr1-devChris Craik2014-11-253-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve DisplayList state outputChris Craik2014-11-213-3/+7
* | | | | | | | | Merge "Start MountService before performBootDexOpt" into lmp-mr1-devDianne Hackborn2014-11-251-14/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Start MountService before performBootDexOptpadarshr2014-11-251-14/+16
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-devJohn Spurlock2014-11-2515-236/+581
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | VolumeZen: Introduce internal vs external ringer mode.John Spurlock2014-11-2515-236/+581
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Define permission for system apps to query size of block" into lmp-mr1...Andres Morales2014-11-252-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Define permission for system apps to query size of blockAndres Morales2014-11-252-1/+10
* | | | | | | | | Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-devBo Liu2014-11-251-0/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix crash in getNativeCanvas when canvasHandle is NULLBo Liu2014-11-241-0/+3
* | | | | | | | | Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new sta...John Reck2014-11-255-75/+35
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Revert "Ensure calling mutate() on DrawableContainer creates a new state"John Reck2014-11-255-75/+35
* | | | | | | | | Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-devJohn Reck2014-11-254-32/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Switch TextureCache to SkPixelRef::fStableIdJohn Reck2014-11-244-32/+30
* | | | | | | | | am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due ...Natalie Masse2014-11-251-4/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundl...Natalie Masse2014-11-251-4/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed ti...Natalie Masse2014-11-251-4/+2
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "Fixed NullPointerException due to null Bundle, changed time interval f...Natalie Masse2014-11-251-4/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fixed NullPointerException due to null Bundle, changed time interval from ms ...Natalie Masse2014-11-241-4/+2
* | | | | | | | | | | | | Merge "Lockup in the print spooler." into lmp-mr1-devSvet Ganov2014-11-254-13/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Lockup in the print spooler.Svet Ganov2014-11-244-13/+33
* | | | | | | | | | | | | am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Andro...Dirk Dougherty2014-11-253-0/+886
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overview...Dirk Dougherty2014-11-253-0/+886
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick...Dirk Dougherty2014-11-253-0/+886
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Doc change: zh-cn translation of Android L overviews.Dirk Dougherty2014-11-243-0/+886
* | | | | | | | | | | | | Merge "Update action bar insets on sw600dp to match Material spec" into lmp-m...Alan Viverette2014-11-254-13/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update action bar insets on sw600dp to match Material specAlan Viverette2014-11-244-13/+34
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Update IME selection dialog layout for Material" into lmp-mr1-devAlan Viverette2014-11-254-69/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update IME selection dialog layout for MaterialAlan Viverette2014-11-244-69/+77
* | | | | | | | | | | | | | Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr...Alan Viverette2014-11-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Cannot set Pivot X,Y values from setPivotX, setPivotY APIjungheang.lee2014-11-211-4/+4
* | | | | | | | | | | | | | | Merge "Make the Context service constant for UsageStats public" into lmp-mr1-devAdam Lesinski2014-11-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \