OSDN Git Service

Merge changes I8405c4fe,I52e6143d am: a38de2e343
authorMark Salyzyn <salyzyn@google.com>
Fri, 30 Sep 2016 00:09:56 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 00:09:56 +0000 (00:09 +0000)
am: 882f870f35

Change-Id: Ieeb9616248bf62dafba9295b9b6af3f4c8ea8c23


Trivial merge