| commit | 5ac4d47091c7210136452febf9d5dd7a2e2e7114 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Sep 09 20:35:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 20:35:52 2014 +0000 |
| tree | 7342967a49e71eeb8c42b3893de7814e84f34c90 | |
| parent | df9d704a6061e70c1f8defa5621745c410d9341e [diff] | |
| parent | da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013 [diff] |
am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev * commit '7a9f541e596b4db8824969678896161c8e06d6bc': User restriction to disallow outgoing NFC beam