Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | camera2: Revise android.sensor.maxFrameDuration definition | Igor Murashkin | 2014-02-03 | 2 | -11/+35 | |
* | | | | | | | | Merge "More battery history improvements." | Dianne Hackborn | 2014-02-03 | 2 | -142/+424 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | More battery history improvements. | Dianne Hackborn | 2014-02-03 | 2 | -142/+424 | |
* | | | | | | | | Merge "Camera2: Update sceneFlicker tag spec" | Zhijun He | 2014-02-03 | 1 | -4/+18 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Camera2: Update sceneFlicker tag spec | Zhijun He | 2014-02-03 | 1 | -4/+18 | |
* | | | | | | | | Merge "Camera2: update lens state tag specs" | Zhijun He | 2014-02-03 | 4 | -16/+89 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Camera2: update lens state tag specs | Zhijun He | 2014-02-03 | 4 | -16/+89 | |
* | | | | | | | | Merge "Introduce "IdleService" API to expose idle-time maintenance to apps" | Christopher Tate | 2014-02-03 | 5 | -0/+335 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Introduce "IdleService" API to expose idle-time maintenance to apps | Christopher Tate | 2014-01-31 | 5 | -0/+335 | |
* | | | | | | | | | Merge "Camera2: Update pixelArraySize and analog sensitivity tags" | Zhijun He | 2014-02-03 | 3 | -7/+8 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Camera2: Update pixelArraySize and analog sensitivity tags | Zhijun He | 2014-02-03 | 3 | -7/+8 | |
* | | | | | | | | Merge "Import translations. DO NOT MERGE" | Geoff Mendal | 2014-02-03 | 6 | -10/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-02-03 | 6 | -10/+7 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | am be878d87: am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ... | John Spurlock | 2014-02-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java | John Spurlock | 2014-02-03 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java | John Spurlock | 2014-02-03 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | am 76ecd66a: am 0196e561: Fix typo in ImageView.java | John Spurlock | 2014-02-03 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | am 0196e561: Fix typo in ImageView.java | John Spurlock | 2014-02-03 | 1 | -1/+1 | |
| | | | |\ \ \ \ | ||||||
| | | | | * | | | | Fix typo in ImageView.java | John Spurlock | 2014-02-03 | 1 | -1/+1 | |
* | | | | | | | | | Fix broken build in BridgeResources | Alan Viverette | 2014-02-01 | 1 | -2/+3 | |
* | | | | | | | | | Merge "Allow specification of View theme override as a theme attribute" | Alan Viverette | 2014-01-31 | 2 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Allow specification of View theme override as a theme attribute | Alan Viverette | 2014-01-24 | 2 | -2/+11 | |
* | | | | | | | | | | am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|s... | John Spurlock | 2014-01-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into ... | John Spurlock | 2014-01-31 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev | John Spurlock | 2014-01-31 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Update READ&WRITE_DREAM_STATE to signature|system. | John Spurlock | 2014-01-31 | 1 | -2/+2 | |
* | | | | | | | | | | | am d5f1fcb7: am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET ... | Craig Mautner | 2014-01-31 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into k... | Craig Mautner | 2014-01-31 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev | Craig Mautner | 2014-01-31 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage | Craig Mautner | 2014-01-31 | 1 | -0/+5 | |
* | | | | | | | | | | | Merge "Improve encapsulation of Resources" | Alan Viverette | 2014-01-31 | 2 | -33/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Improve encapsulation of Resources | Alan Viverette | 2014-01-31 | 2 | -33/+42 | |
* | | | | | | | | | | | | Merge "record the notification style" | Chris Wren | 2014-01-31 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | record the notification style | Chris Wren | 2014-01-31 | 1 | -0/+2 | |
* | | | | | | | | | | | | Merge "Add initial hidden outline APIs" | Chris Craik | 2014-01-31 | 3 | -6/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add initial hidden outline APIs | Chris Craik | 2014-01-30 | 3 | -6/+64 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and ... | Narayan Kamath | 2014-01-31 | 7 | -237/+247 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related class... | Narayan Kamath | 2014-01-31 | 7 | -237/+247 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | AArch64: Make AssetManager and related classes 64-bit compatible | Ashok Bhat | 2014-01-31 | 7 | -237/+247 | |
* | | | | | | | | | | | | | am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working corr... | Narayan Kamath | 2014-01-31 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" | Narayan Kamath | 2014-01-31 | 1 | -3/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Fixed cancel() not working correctly" | Narayan Kamath | 2014-01-31 | 1 | -3/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Fixed cancel() not working correctly | jl1990 | 2014-01-30 | 1 | -3/+12 | |
* | | | | | | | | | | | | | | am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface sh... | Igor Murashkin | 2014-01-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set prod... | Igor Murashkin | 2014-01-31 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" | Igor Murashkin | 2014-01-31 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | EGL14.eglCreateWindowSurface should set producerControlledByApp | Takahiro Aizawa | 2013-12-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp | Narayan Kamath | 2014-01-31 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default | Brian Carlstrom | 2014-01-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert... | Narayan Kamath | 2014-01-31 | 2 | -33/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / |