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