OSDN Git Service

Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b
authorDavid Brazdil <dbrazdil@google.com>
Wed, 9 May 2018 16:10:31 +0000 (09:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 16:10:31 +0000 (09:10 -0700)
am: 6982bf4bde

Change-Id: If80460dad9656f1bdad492a951f1e7247799e7b1


Trivial merge