OSDN Git Service

Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4
authorAdam Seaton <aseaton@google.com>
Tue, 23 May 2017 17:40:44 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 17:40:44 +0000 (17:40 +0000)
commitfe5a42c88d78535aec21fe7df767034975de963c
tree97abd38cf412bce9e873ea383af9717caf34b519
parent111b9d559911aed3910754e000230fd55cc33150
parente01e278881c6f6a659dcc58300f6c496be5dc646
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4
am: e01e278881

Change-Id: I551a205e346cc21af3befafb7a0194693ed83c94