| commit | e819c4358d81ac04cdf5744eab6974fa17ee3303 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Fri Aug 14 09:52:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 09:52:58 2015 +0000 |
| tree | 6c3c848fafab5878460ca2dbfc0e2dbba8aae6b1 | |
| parent | bf6a2a7057623eae9a6dd2d91e9834ac841ca965 [diff] | |
| parent | 68a94e9cfe1485e1b6619f6b5a61a200abf1b44e [diff] |
am 68a94e9c: am fc5809fa: Merge "CtsVerifier: Test NFC sharing user restriction" into lollipop-mr1-cts-dev * commit '68a94e9cfe1485e1b6619f6b5a61a200abf1b44e': CtsVerifier: Test NFC sharing user restriction