commit | 02ef2ebe10a21348bfc27f70c45d413427f0377e | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Wed Mar 08 22:21:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Mar 08 22:21:05 2017 +0000 |
tree | f78e72de677a26551f745d5cb2de262ed5372e7b | |
parent | 21f088ab2b1ca62709a7cc06df5da0969ef9a436 [diff] | |
parent | 9c88823f4ec5a0bc35955e9dae4518cb78c31793 [diff] |
Merge "Merge "DO NOT MERGE Exit when device info fails." into marshmallow-cts-dev am: 13e7461f80 -s ours" into nougat-cts-dev am: 5415774b62 -s ours am: 9ce097eb17 am: 932bc03353 am: 8a88c36b21 am: 53951afb47 am: 1beac6bf55 am: 9c88823f4e -s ours Change-Id: Ia35578855245cdf7bdf4bc2705bfca015118ac3f