diff options
author | Chong Zhang <chz@google.com> | 2016-06-20 18:14:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 18:14:35 +0000 |
commit | d0a87b656727def74918de666026bc2e5cb653eb (patch) | |
tree | a805195869e85adf90e901cfbea2a67a919bac97 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fcb2c1b64581522d2f1fd3624202d18762079072 (diff) | |
parent | 781c0e2afc40aa1eec5e972e049a453c6f29e26e (diff) |
Merge \\"Make sure fontScale in configuration sent to app is equal to global\\" into nyc-dev am: 7c6692646c
am: 781c0e2afc
Change-Id: I2e3c92bce3b77c00f1a2dcce58b43f540752bf37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions