diff options
| author | Kevin Hufnagle <khufnagle@google.com> | 2016-05-27 03:27:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:27:58 +0000 |
| commit | 302e608b732057d93ca2fd5941723829af3a1804 (patch) | |
| tree | ac2b3bae8cf80a3a18d9ab0cd6ddd4317a36728f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 828d70166742f11740f9a953164f984a32db5fa8 (diff) | |
| parent | 8d063a396fbce3fae74c423a181a36272ee91231 (diff) | |
Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev
am: 8d063a396f
* commit '8d063a396fbce3fae74c423a181a36272ee91231':
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Change-Id: I5459f1583202ccf9567e67382a1098f3a92fc0fd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions