diff options
| author | Victor Chang <vichang@google.com> | 2016-05-31 09:59:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 09:59:59 +0000 |
| commit | 0075bf312c34bc98c3dd26d8233d25bf753a3256 (patch) | |
| tree | 9ba887cf1b48f80c48c2c1b656917c795d89949c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 261c10d0fc1d90cacb61a0017eefd4f100d0ded2 (diff) | |
| parent | d6d2497ebe90e74f0ee7ddfdd2a00f4cb2f25dce (diff) | |
Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b
am: d6d2497ebe
* commit 'd6d2497ebe90e74f0ee7ddfdd2a00f4cb2f25dce':
Finish ConfirmDialog when another vpn app is always-on
Change-Id: I7a44158b41c20d297e3e1c2869bb0a58549e84a2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions