diff options
author | Robin Lee <rgl@google.com> | 2016-09-08 10:58:41 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-08 10:58:41 +0000 |
commit | 9368dd17ae280ff3b154a3ba540e28b4f212cde6 (patch) | |
tree | 1b3f7ad203bfe363398a3ebda390efc9a32bb886 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cf19bfec90a15c12dae39bc48f8fc2c0a7dafcd8 (diff) | |
parent | 6c99793491723d3e6decd4394428781bb109fe2d (diff) |
Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev
am: 6c99793491
Change-Id: I6e97cbef6612312029060a3182d4697839b0d651
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions