diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-05-20 20:11:39 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-05-20 20:15:29 -0700 |
| commit | c7becb7ee78881646251ff4846e63eb6b96bf7ec (patch) | |
| tree | a42141a24ea950f26b21faf95157f8f2513f66d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8562b08f04c1309cf40db1e749d612b6824f1d12 (diff) | |
| parent | 47249f2a9e49aa9626369517315eafc6b42fd8e9 (diff) | |
resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.
Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions