tree 485f57810056bded6b643a6e9494e4a9c01c68e6
parent 7a2fa282f07fe3234167be3eb1b80efce17f58fb
parent b2a79c4093f17feb39893d5a917cdd8d5f23197b
author Nobu Hayashi <nobuh@google.com> 1486447730 +0000
committer android-build-merger <android-build-merger@google.com> 1486447730 +0000

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" into marshmallow-cts-dev am: 3cc8a3d1a2  -s ours am: 28422c418e  -s ours am: 9b73dd0868 am: 5ddbb31285" into nyc-mr1-dev am: 03ed9d956b am: 9056d62d3d" into nyc-mr1-dev-plus-aosp am: bd70c32d91
am: b2a79c4093  -s ours

Change-Id: I98053a63954a61a2a2ab837d507796c34e3e4b34