OSDN Git Service

Merge changes I5762a98d,I39f4e015 into oc-dev
authorRobert Carr <racarr@google.com>
Tue, 30 May 2017 21:39:09 +0000 (21:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 May 2017 21:39:09 +0000 (21:39 +0000)
commit8a967672d5cd88d2165a4ac480a39e143eda97c5
tree4ffd4bcc9103895ce9a279b5355b10b9d0f59f1e
parent1ee4894e6c3c421937c3a229de5c87132aac369e
parentc56b1d3c98da98f0290ed3037de63f9e6283125b
Merge changes I5762a98d,I39f4e015 into oc-dev
am: c56b1d3c98

Change-Id: I4e6931609d4a3fc8a0c80b58f9d279f1f65d6a10