OSDN Git Service

Merge changes I868417f4,I57ac3667 am: 8336b64442
authorDimitry Ivanov <dimitry@google.com>
Tue, 9 Aug 2016 00:40:37 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 00:40:37 +0000 (00:40 +0000)
am: f24a92d7b1

Change-Id: I8368368829f0480b3cdfcb9b4bb48231266fa4d4


Trivial merge