summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | camera2: Revise android.sensor.maxFrameDuration definitionIgor Murashkin2014-02-032-11/+35
* | | | | | | | Merge "More battery history improvements."Dianne Hackborn2014-02-032-142/+424
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | More battery history improvements.Dianne Hackborn2014-02-032-142/+424
* | | | | | | | Merge "Camera2: Update sceneFlicker tag spec"Zhijun He2014-02-031-4/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Camera2: Update sceneFlicker tag specZhijun He2014-02-031-4/+18
* | | | | | | | Merge "Camera2: update lens state tag specs"Zhijun He2014-02-034-16/+89
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Camera2: update lens state tag specsZhijun He2014-02-034-16/+89
* | | | | | | | Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"Christopher Tate2014-02-035-0/+335
|\ \ \ \ \ \ \ \
| * | | | | | | | Introduce "IdleService" API to expose idle-time maintenance to appsChristopher Tate2014-01-315-0/+335
* | | | | | | | | Merge "Camera2: Update pixelArraySize and analog sensitivity tags"Zhijun He2014-02-033-7/+8
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Camera2: Update pixelArraySize and analog sensitivity tagsZhijun He2014-02-033-7/+8
* | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-02-036-10/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-02-036-10/+7
| | |_|/ / / / | |/| | | | |
* | | | | | | am be878d87: am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ...John Spurlock2014-02-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
| | |\ \ \ \
| | | * \ \ \ am 76ecd66a: am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
| | | |\ \ \ \
| | | | * \ \ \ am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
| | | | |\ \ \ \
| | | | | * | | | Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
* | | | | | | | | Fix broken build in BridgeResourcesAlan Viverette2014-02-011-2/+3
* | | | | | | | | Merge "Allow specification of View theme override as a theme attribute"Alan Viverette2014-01-312-2/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow specification of View theme override as a theme attributeAlan Viverette2014-01-242-2/+11
* | | | | | | | | | am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|s...John Spurlock2014-01-311-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into ...John Spurlock2014-01-311-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-devJohn Spurlock2014-01-311-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update READ&WRITE_DREAM_STATE to signature|system.John Spurlock2014-01-311-2/+2
* | | | | | | | | | | am d5f1fcb7: am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET ...Craig Mautner2014-01-311-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into k...Craig Mautner2014-01-311-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-devCraig Mautner2014-01-311-0/+5
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usageCraig Mautner2014-01-311-0/+5
* | | | | | | | | | | Merge "Improve encapsulation of Resources"Alan Viverette2014-01-312-33/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve encapsulation of ResourcesAlan Viverette2014-01-312-33/+42
* | | | | | | | | | | | Merge "record the notification style"Chris Wren2014-01-311-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | record the notification styleChris Wren2014-01-311-0/+2
* | | | | | | | | | | | Merge "Add initial hidden outline APIs"Chris Craik2014-01-313-6/+64
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add initial hidden outline APIsChris Craik2014-01-303-6/+64
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and ...Narayan Kamath2014-01-317-237/+247
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related class...Narayan Kamath2014-01-317-237/+247
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | AArch64: Make AssetManager and related classes 64-bit compatibleAshok Bhat2014-01-317-237/+247
* | | | | | | | | | | | | am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working corr...Narayan Kamath2014-01-311-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"Narayan Kamath2014-01-311-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Fixed cancel() not working correctly"Narayan Kamath2014-01-311-3/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixed cancel() not working correctlyjl19902014-01-301-3/+12
* | | | | | | | | | | | | | am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface sh...Igor Murashkin2014-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set prod...Igor Murashkin2014-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"Igor Murashkin2014-01-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | EGL14.eglCreateWindowSurface should set producerControlledByAppTakahiro Aizawa2013-12-181-1/+1
| * | | | | | | | | | | | | | resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aospNarayan Kamath2014-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
| * | | | | | | | | | | | | | am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...Narayan Kamath2014-01-312-33/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /