| commit | 8395bd3c843731fdd3ed34ff74fe45e773610b53 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Jan 19 19:49:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 19 19:49:54 2017 +0000 |
| tree | b83220e2896a0fc764268b20ff2492c3eaae53d3 | |
| parent | 6b10a8c84bda20085c800154a46d599776f40673 [diff] | |
| parent | 1de393ba86927066a00c11e5d2705aa0b9504268 [diff] |
Merge "Merge "Merge "Check bluetooth support when testing "Disable NFC beam"" into lollipop-mr1-cts-dev am: ad45b93937" into marshmallow-cts-dev am: e66e1e5e5a" into nougat-cts-dev am: 0411a2b747 am: 1de393ba86 Change-Id: Ibe702e6c62bdd8d9c0749180ef4649a8f2b74849