diff options
| author | Daniel Nishi <dhnishi@google.com> | 2016-04-21 17:57:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-21 17:57:04 +0000 |
| commit | fca91266dfa525a97423b5222a49bdbcd0bf24ba (patch) | |
| tree | b1dd615646bedfd7acc728150bb9e535c634344d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6bf97365f6d9b534eb4807091d2b1611bd654191 (diff) | |
| parent | 0cdb8177eaa47a3a5d3c1ba5112bc3385b70c78a (diff) | |
Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev
am: 0cdb8177ea
* commit '0cdb8177eaa47a3a5d3c1ba5112bc3385b70c78a':
Add a branded VPN icon for quick settings and status bar.
Change-Id: I61b79cb9b3007116ad8b6c37987f511f1c623ddf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions