OSDN Git Service

Merge \"Update CTS shims\" into nyc-dev
authorTodd Kennedy <toddke@google.com>
Wed, 15 Jun 2016 01:35:17 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 01:35:17 +0000 (01:35 +0000)
commitf90ff6ef36ca77535225c8fbc6c710e7a8b3a26d
tree581459c863f253797acc82614c0ab5a438958734
parentf654d3e081624e2c213ce8e63af1bbaaae674597
parent6f140a249abe28e63749ee1e0838b1f002ce071f
Merge \"Update CTS shims\" into nyc-dev
am: 6f140a249a

Change-Id: I6746c7b2484398787dc29fb9a67cba88b79ad74d