| commit | 52f57637a22d872cea6ba3d5bcb6a004c0293574 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Sep 09 20:38:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 20:38:39 2014 +0000 |
| tree | e6247dbef46ba864db6ea42ce8184f5d596b6708 | |
| parent | 84deabbb262f949301156df37e140c95fb7bb7a4 [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