diff options
author | Adrian Roos <roosa@google.com> | 2014-03-31 19:26:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-31 19:26:11 +0000 |
commit | e6978cda7110823f70cc74319c37bd512866c6f1 (patch) | |
tree | 6ef24c020290ec04af51245a716c4ee22193a4b0 /wifi/java/android/net | |
parent | f4f3de7ac747ee02175e52f94b638f3b0239181e (diff) | |
parent | 53ab5174d5009786dc58da3011181b77e325c130 (diff) | |
download | frameworks_base-e6978cda7110823f70cc74319c37bd512866c6f1.zip frameworks_base-e6978cda7110823f70cc74319c37bd512866c6f1.tar.gz frameworks_base-e6978cda7110823f70cc74319c37bd512866c6f1.tar.bz2 |
am 53ab5174: Merge "Define trust agent framework components"
* commit '53ab5174d5009786dc58da3011181b77e325c130':
Define trust agent framework components
Diffstat (limited to 'wifi/java/android/net')
0 files changed, 0 insertions, 0 deletions