OSDN Git Service

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

Change-Id: Iea2d44645bc33c1d4564bd7ef8e3f8c73c0b20cb


Trivial merge