diff options
| author | Victor Chang <vichang@google.com> | 2016-05-31 09:51:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 09:51:58 +0000 |
| commit | f5464121c0050bd8926f243a7f84fcc3282864d5 (patch) | |
| tree | 6750acfe3dc21131becad5b8063e3a6ac729a377 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 86b4701d7f7c4f4e7d430daa267316f2e8af04ef (diff) | |
| parent | 98801e9f2bec03faf9be0c8bb961150004d309ff (diff) | |
Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev
am: 98801e9f2b
* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
Finish ConfirmDialog when another vpn app is always-on
Change-Id: I84db62a24c34bf8dea6f99d34e108cbb0fc0517f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions