| commit | fbf97a709c0e499759b3b12b2152004304e44023 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Thu Aug 06 21:12:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 21:12:58 2015 +0000 |
| tree | e61106721aa06f8a1fc19bb4eee8a7f876b960db | |
| parent | 8dd77d2b586eaccc3ca7817aeedde02ec3029b2a [diff] | |
| parent | 56367cebbf6ddfa5ae0986bec142f658cd1bebd2 [diff] |
am 56367ceb: am aab71cc8: am 85b6f457: Merge "CTS: Test NFC sharing user restriction" into lollipop-mr1-cts-dev * commit '56367cebbf6ddfa5ae0986bec142f658cd1bebd2': CTS: Test NFC sharing user restriction