diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-06-22 19:17:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 19:17:43 +0000 |
commit | a72a6aae37f79408dfbfc6a47167370e242ef3fa (patch) | |
tree | 8c9a28c95f01daa7ec610267ed6a0519ab111867 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c5dc9519373d72553d03709ab36ccc1347e83936 (diff) | |
parent | 0bf31c3fa6263f595022d8f3addfd4d28f70db99 (diff) |
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6
Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions