tree f78e72de677a26551f745d5cb2de262ed5372e7b
parent 02ef2ebe10a21348bfc27f70c45d413427f0377e
parent 7d1cf9a02697576864ee35f164bf5a90f3d92cbe
author Nicholas Sauer <nicksauer@google.com> 1489012270 +0000
committer android-build-merger <android-build-merger@google.com> 1489012270 +0000

Merge "DO NOT MERGE Exit when device info fails." into marshmallow-cts-dev am: 13e7461f80  -s ours am: 0df21819e5 am: 27fb1e6a10 am: 550004f9a5 am: 7a96a010d4  -s ours am: 23ebed0e9c am: 3e096fdafc am: fd167a7faa am: a20c0fef7f am: f7b351662b
am: 7d1cf9a026  -s ours

Change-Id: Id20489fdcc99c9d0ba4e0942433d12f90bcd0dcd