| commit | 5b0458a8a2c2de40e9df85f82ab0ebc7d136672b | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Jan 19 19:34:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 19 19:34:35 2017 +0000 |
| tree | ddbaa42b647faf9728ad7afb9878948f4a93359e | |
| parent | 624d6638cb108e57f2cd2ba9d6008d8a73c2cf0e [diff] | |
| parent | e66e1e5e5ac7ecf365b57991dbfb2ae677cbf7a0 [diff] |
Merge "Merge "Check bluetooth support when testing "Disable NFC beam"" into lollipop-mr1-cts-dev am: ad45b93937" into marshmallow-cts-dev am: e66e1e5e5a Change-Id: Ie3974465fefe71c1f598b5b392b41b34344dc1a5