OSDN Git Service

Merge changes I7a3e9ee7,I29702219 am: 4929fa2ecb
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 31 Oct 2017 23:18:58 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 23:18:58 +0000 (23:18 +0000)
am: f9270f960e

Change-Id: Ie4108e9cfe117f47f1625ff9d83a96649de9a169


Trivial merge