OSDN Git Service

Merge changes I4b90b6ee,I37c5a138,I6ff0c0dc am: 0127861a18
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 17 Oct 2017 22:32:15 +0000 (22:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Oct 2017 22:32:15 +0000 (22:32 +0000)
am: 2c02fc3d51

Change-Id: I0ee0a2d7aba16c3bbd9e5fb22745852a87543451


Trivial merge