OSDN Git Service

Merge changes I193297e0,I43beb966 am: c729ff8253
authorHugo Benichi <hugobenichi@google.com>
Sat, 24 Jun 2017 00:40:48 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Jun 2017 00:40:48 +0000 (00:40 +0000)
commit050c95d6796cc2e34ec01328c5e18bd6b34e207f
tree65808ffd16b20355ef9dc03305b16b4bdb0a7493
parent7fd14c46ef52000379574bb6f044dda03c8f1149
parent5dec1df23b9cc5ceea727fb68e697c20225d73e1
Merge changes I193297e0,I43beb966 am: c729ff8253
am: 5dec1df23b  -s ours

Change-Id: If036f9c7b4219a20ddb21d5aa1b7f3e3b29bee51