OSDN Git Service

[automerger skipped] Merge changes Id598ae1d,I475bd011 am: 1ad99fb064
authorChalard Jean <jchalard@google.com>
Mon, 22 Apr 2019 02:37:06 +0000 (19:37 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Apr 2019 02:37:06 +0000 (19:37 -0700)
commit9845228b3fab4eb47182f98003b3f9dea12ed149
tree7468df1af21b2583d6441cdf95efa0e9fd0b0298
parent67d6e6894ee9f335f865d84f172b6c25f31dd4ba
parent64a7ccc1c59954685eefb2a1c1571dbaa81d1fbc
[automerger skipped] Merge changes Id598ae1d,I475bd011 am: 1ad99fb064
am: 64a7ccc1c5 -s ours
am skip reason: change_id I325fd3eda6e89228353342f00a49f50b22b17071 with SHA1 14d635ac5b is in history

Change-Id: I9123fd3e3c712f084f49c63a570986c399382364