OSDN Git Service

Merge \\"Update CTS shims\\" into nyc-dev am: 6f140a249a
authorTodd Kennedy <toddke@google.com>
Wed, 15 Jun 2016 01:43:35 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 01:43:35 +0000 (01:43 +0000)
commit0ab954551348f31a6c09d95cc34f1ba9809b277e
tree84ff01fa92e4b2684c70c3e1b703d01e2588010e
parent875debe4012ba25d62f7cc473c98f5f58f9fdac8
parent418fb41ac5e48eac4f0c09ce2703b1747fa85acd
Merge \\"Update CTS shims\\" into nyc-dev am: 6f140a249a
am: 418fb41ac5

Change-Id: I07b451a209d5b713420b1fd86ee3d6dee508bc41