diff options
author | Dan Stoza <stoza@google.com> | 2015-09-04 02:21:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 02:21:41 +0000 |
commit | 8dcd14cdc95a5b71597fa428b9c2a45c3a86944c (patch) | |
tree | 4150f094f583c43ae848813ead29023cd21a2416 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 453ed7ddae6fda8ebb5931011f821ce1982a6a4b (diff) | |
parent | 4a90942ea75039f916d8371111fdc41a80039b98 (diff) |
am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '4a90942ea75039f916d8371111fdc41a80039b98':
SurfaceControl: Add colorTransform to DisplayInfo
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions