| commit | 1c1016576298d686cdd57cb5b71936df948a4c7b | [log] [tgz] |
|---|---|---|
| author | Nobu Hayashi <nobuh@google.com> | Tue Feb 07 04:24:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 07 04:24:42 2017 +0000 |
| tree | ffae1c5d4fd0e029e9e9e6e6529a0eadcfa3f1d8 | |
| parent | e012049c768328b4dc4dbdc24a14ee7aa65d5ef4 [diff] | |
| parent | e8e73b047c9b012b582f1d4f2783535e8d21de79 [diff] |
Merge "Merge "Merge "Merge "DO NOT MERGE - add comments to indicate false-positive CTS 5.1 tests for Automotive devices." into lollipop-mr1-cts-dev am: 880a57a82d -s ours am: 649f6589e9 -s ours" into nougat-cts-dev am: f053119e30 -s ours am: 45072a3ff8 am: b0c2d629bc" into nyc-mr1-dev am: d68639ecce am: 8427adf4af" into nyc-mr1-dev-plus-aosp am: e8e73b047c Change-Id: Id28cc1d3c6098413b55426d010afbd570e0dd7d9