OSDN Git Service

Merge changes Ia15f77e2,Icaa1f95c
authorHugo Benichi <hugobenichi@google.com>
Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)
commit8e5ebd9261afa6eb8e6a1e7ae2c1817244437e63
treedbdf108e6b230bb84607bb3d2cb872fc63aa3175
parent85f5725fb53ec1af4b31643e4cf4facbfee26d6a
parentc923752929e8221fdcaf75bae3db00872b894bb7
Merge changes Ia15f77e2,Icaa1f95c
am: c923752929

Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc