| commit | 8613bcdf9efaf1ae1fc31b2a22f0787668f13bf2 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Thu Aug 27 09:41:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 09:41:38 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 2f3c72b977efe0fab18cff7c8ab35e7847953841 [diff] | |
| parent | 8be74faef90625e429b3e3578a5357d5c7e3f757 [diff] |
am 8be74fae: (-s ours) am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev * commit '8be74faef90625e429b3e3578a5357d5c7e3f757':