summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Add new phone type (public API) DO NOT MERGE"Sailesh Nepal2014-02-124-37/+32
* Add new phone type (public API) DO NOT MERGESailesh Nepal2014-02-114-32/+37
* am 1717eb1d: am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for...Jeff Brown2014-02-110-0/+0
|\
| * am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for injecting ev...Jeff Brown2014-02-120-0/+0
| |\
| | * am be83e4a0: am 38f96e50: Add support for injecting events into ActivityConta...Jeff Brown2014-02-129-101/+221
| | |\
| | | * am 38f96e50: Add support for injecting events into ActivityContainers. (DO NO...Jeff Brown2014-02-129-101/+221
| | | |\
| | | | * Add support for injecting events into ActivityContainers. (DO NOT MERGE)Jeff Brown2014-02-119-101/+221
* | | | | am 47b32a0b: Merge "Add support for injecting events into ActivityContainers."Jeff Brown2014-02-116-10/+74
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add support for injecting events into ActivityContainers."Jeff Brown2014-02-126-10/+74
| |\ \ \ \
| | * | | | Add support for injecting events into ActivityContainers.Jeff Brown2014-02-116-10/+74
* | | | | | reset to master at 340312e with historyQiwen Zhao2014-02-110-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master-nova' of persistent-https://googleplex-android.googlesou...Qiwen Zhao2014-02-116-2/+37
| |\ \ \ \ \
| | * \ \ \ \ am 9b6fa775: Merge "Implement missing safelyRun() on ThreadedRenderer"John Reck2014-02-116-2/+37
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master-nova' of persistent-https://googleplex-android.googlesou...Qiwen Zhao2014-02-114-33/+63
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 3b1da03c: Merge "camera2: Clean up cross-references"Eino-Ville Talvala2014-02-114-33/+63
| | |\ \ \ \ \ \
| * | | | | | | | reset to master for this file since it is missing an older change.Qiwen Zhao2014-02-111-152/+0
| |/ / / / / / /
| * | | | | | | Merge branch 'master-nova' of persistent-https://googleplex-android.googlesou...Qiwen Zhao2014-02-110-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am faa91f85: am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store ...Narayan Kamath2014-02-116-90/+113
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am b1ed19a2: am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\...Narayan Kamath2014-02-111-2/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 7f258f97: am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store ...Narayan Kamath2014-02-112-19/+19
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am a1cffb42: am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for point...Narayan Kamath2014-02-114-53/+53
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 3ff18faa: am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to...Narayan Kamath2014-02-111-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 091e8d2a: Fix build.Narayan Kamath2014-02-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am cab8617b: am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor ...Jeff Brown2014-02-1119-197/+177
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 33fa09b1: am 2d6b55aa: am 312ba86b: Change task removal sequenceCraig Mautner2014-02-112-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'f6eebb21' into master-novaQiwen Zhao2014-02-1156-893/+1136
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Don't remove Activities and Tasks until animation doneCraig Mautner2014-02-116-17/+63
| * | | | | | | | | | | | | | | | am 7f477021: Merge "Maybe fix issue #12957738: SecurityException in..."Dianne Hackborn2014-02-101-15/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | reset to master for rs/java/android/renderscriptQiwen Zhao2014-02-1025-235/+7581
| * | | | | | | | | | | | | | | | | reset back to previous master-nova at sha1 cd0318f6f41de8fd70e873840c78340f38...Qiwen Zhao2014-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ reset to master @66ebe94 with historyQiwen Zhao2014-02-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 694a022c: am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn ...Dan Sandler2014-02-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a0ab96d1: Merge "camera2: Simplify min frame durations and add available s...Igor Murashkin2014-02-075-98/+263
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ad0aa838: Merge "camera2: Update hotpixel tags."Ruben Brunk2014-02-075-0/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d531f88f: Merge "camera2: Add tags for querying capabilities of a camera d...Igor Murashkin2014-02-073-8/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 672ad888: Merge "camera2: Add android.scaler.availableInputOutputFormatsMap"Igor Murashkin2014-02-072-1/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d5fdd1c1: camera3: Update raw color calibration transform tags.Ruben Brunk2014-02-072-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b7b2de78: Fixbuild. Add api update for camera profile tags.Ruben Brunk2014-02-071-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a9bfdbbb: camera3: Add camera profile properties.Ruben Brunk2014-02-072-0/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8954f6f0: Merge "Camera2: Add OFF_KEEP_STATE mode"Zhijun He2014-02-074-2/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aa1567f9: Merge "camera3: Make blackLevelPattern optional."Ruben Brunk2014-02-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 12b805bb: Merge "Camera2: Update focus distance related tags"Zhijun He2014-02-073-6/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3759ec9b: Merge "camera3: Add camera neutral tag."Ruben Brunk2014-02-072-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 97f0ed03: Merge "camera3: Update blackLevelPattern tag."Ruben Brunk2014-02-072-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 82946aae: Merge "Add the clipToOutline by just using the clipPathOp"ztenghui2014-02-075-3/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68ac5cef: Merge "Battery stats: more events, fixes."Dianne Hackborn2014-02-076-52/+274
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8852ab43: Merge "Keep the SkPaint used when creating a layer."Derek Sollenberger2014-02-077-54/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 876e359b: Merge "Make QS battery composite color match others."John Spurlock2014-02-074-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 27bfb245: Merge "Rework and clean up DisplayList projection"Chris Craik2014-02-0711-85/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1a88d834: KeyChain: add explicit package for getPrivateKeyKenny Root2014-02-071-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-09 05:45:23 +0000