diff options
| author | Robin Lee <rgl@google.com> | 2016-06-06 10:51:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-06 10:51:32 +0000 |
| commit | c3c247560e0321ca0b811175ec103b8eabfd49cd (patch) | |
| tree | 9bdd923c9360214d8f404c1ce42044a8e1474f10 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4aca318f09bde4fee1805c289ceae0af5e072022 (diff) | |
| parent | aeb86ec3bf8c39a29efe8a846472846cbec16103 (diff) | |
Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: d2cf835880" into nyc-mr1-dev-plus-aosp
am: aeb86ec3bf
* commit 'aeb86ec3bf8c39a29efe8a846472846cbec16103':
Change-Id: I84476b69eac613027d239b9b07b639d071aa3e29
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions