diff options
author | Robin Lee <rgl@google.com> | 2016-09-08 11:03:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-08 11:03:02 +0000 |
commit | 4446afae2b475c2c57cadf5b663bf9e7ec35430c (patch) | |
tree | e7516beb9359655fe5f73dc87485e21a79b40748 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 27247a111904688249d0d63ed5c4949818b64fe8 (diff) | |
parent | 9368dd17ae280ff3b154a3ba540e28b4f212cde6 (diff) |
Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev am: 6c99793491
am: 9368dd17ae
Change-Id: If130598e24ef0e6dc5ba1f02269995e123f6d470
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions