| commit | 21f088ab2b1ca62709a7cc06df5da0969ef9a436 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Mar 08 22:13:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 08 22:13:39 2017 +0000 |
| tree | f78e72de677a26551f745d5cb2de262ed5372e7b | |
| parent | c1e6cfa156398d5b0a2323fe6622b8a88f98b605 [diff] | |
| parent | 6f65bed891aadd116677ffc2b91131b06ebe8cb5 [diff] |
Merge "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" into nougat-mr1-cts-dev am: 663550f11e -s ours am: f8871d0f9a am: c86dd0adf4 am: 5d7da59dee am: 6f65bed891 -s ours Change-Id: I449d2cdc96c23ef5742e8a459b932fcc2f918fd0