OSDN Git Service

Merge changes I7a3e9ee7,I29702219
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 31 Oct 2017 22:00:22 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 22:00:22 +0000 (22:00 +0000)
commitf9270f960e00dab8f3e618c0791dd3a4c1e02141
tree1e72bd8e5f54e605086e2120049f824e4882949a
parentf0ffbd3df992a84eb6676ebea3186fb7f342ffe9
parent4929fa2ecb59cbd5a3c6aad7fd5f9034414217fe
Merge changes I7a3e9ee7,I29702219
am: 4929fa2ecb

Change-Id: I3dae9559ce9434bdc266d45c2dda702fe15499ca