diff options
author | Hung-ying Tyan <tyanh@google.com> | 2015-07-31 03:10:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 03:10:33 +0000 |
commit | 4581ca5308fde9e7a0aafc7bda6fe3cd878efc22 (patch) | |
tree | 7bcbf409b1e35d45b81b3ffa2c62f2ad3327a9e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9bd5d8a6f9e22cc6d72c7ecdd281a1aa8deadf75 (diff) | |
parent | 7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1 (diff) |
am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1':
Revise lockdown check in getLegacyVpnInfo()
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions