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)
commit2ca59c402af98be8d6158234c35a713d6eafaf6c
tree1e72bd8e5f54e605086e2120049f824e4882949a
parentc9412262051ee6f8fbb4644f5bad2c22505cfbcf
parentf9270f960e00dab8f3e618c0791dd3a4c1e02141
Merge changes I7a3e9ee7,I29702219 am: 4929fa2ecb
am: f9270f960e

Change-Id: Ie4108e9cfe117f47f1625ff9d83a96649de9a169