OSDN Git Service

Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 00:58:10 +0000 (00:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:58:10 +0000 (00:58 +0000)
commit7dcbf967fa48b0dad1b1a60c7b7c2cf58083afd9
treeee2eea87c164fc5a85d2b0ed551c44ba39801840
parent0c97adde47ea6fad37c729add0c8159d2464c4e7
parent56fc279b7da5c259892ae6d35f45d12be5351925
Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
am: 56fc279b7d

Change-Id: I8be5efd510bfd81097747451ee7adf62e8b36544