commit | 626861c5a5c6a9b8719541627ec22f1e9bd06003 | [log] [tgz] |
---|---|---|
author | Andres Morales <anmorales@google.com> | Fri Jun 20 17:40:56 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 20 02:15:46 2014 +0000 |
tree | 8d06356a53ca33d9af7084a45fa6cbcee67b9e4d | |
parent | 2930764885111d7fbd519397be663aae83b15426 [diff] | |
parent | 3b33fd283c32a8fb707a23d25f3f3cf13e8b046f [diff] |
Merge "Framework changes to support NFC trustlet."