commit | 1f4ea68a070d4e78f29a86d72968fb6580b13af2 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Tue Sep 09 21:56:09 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 21:56:09 2014 +0000 |
tree | 62b39b02662a389d6ff4206b2ef1a374146460bf | |
parent | 30d40e707b33152d23a00b47c73f6de8207e8746 [diff] | |
parent | 5ac4d47091c7210136452febf9d5dd7a2e2e7114 [diff] |
am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev * commit 'd94df395a87836b5dba6bd159010046e1d016661': User restriction to disallow outgoing NFC beam