diff options
author | Christine Franks <christyfranks@google.com> | 2017-10-27 04:28:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-27 04:28:48 +0000 |
commit | 04dd93ac33f68b63b343acd20f468ffa1fb835e1 (patch) | |
tree | 732161d849b698da576505117aa3872f5d37eda6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1602cb58f346af042e612448323f5678780be15a (diff) | |
parent | a109ca0c7b14b603dae08c7328692f8e8e8d4e44 (diff) |
Merge "Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am: 37082aa53e -s ours" into oc-mr1-dev am: 074ecca5e0 -s ours" into oc-mr1-dev-plus-aosp
am: a109ca0c7b -s ours
Change-Id: I4fcaed98730e1c0c448aa72315fa32685eaeaccd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions