diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-05-22 00:24:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-22 00:24:49 +0000 |
| commit | b72a84ee2e11defec24bd16a141f1baf2c77049d (patch) | |
| tree | 561c4abf17334df2e09bdc8c51163287fcce6cd9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 720a18ab3c3e8ca14c0ac40d8a8b6c31d704d35b (diff) | |
| parent | 91e5b0f598f19499e55dcb8f0243b430e3c1ee4f (diff) | |
am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit '91e5b0f598f19499e55dcb8f0243b430e3c1ee4f':
Support for devices with a chin.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions