diff options
author | Amith Yamasani <yamasani@google.com> | 2014-09-09 20:29:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 20:29:57 +0000 |
commit | da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013 (patch) | |
tree | e2561a92276ba6ba431bb20f5e20ebb33812f52b /cmds/am | |
parent | a237e05cd7d86bd322b15b1552dcb93f9f70c0f1 (diff) | |
parent | 26af829fd70609cf073b56e54e1f78faf83a5e8b (diff) | |
download | frameworks_base-da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013.zip frameworks_base-da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013.tar.gz frameworks_base-da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013.tar.bz2 |
Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
Diffstat (limited to 'cmds/am')
0 files changed, 0 insertions, 0 deletions