OSDN Git Service

Merge changes I51ee7070,I499a70a9
authorEric Biggers <ebiggers@google.com>
Thu, 5 Sep 2019 23:48:16 +0000 (16:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Sep 2019 23:48:16 +0000 (16:48 -0700)
am: 59e1ab234c

Change-Id: I86d5c8b423f26c3a965bedad59753d374d137306


Trivial merge