OSDN Git Service

Merge changes I737a864e,Idc41b2a5
authorHansong Zhang <hsz@google.com>
Tue, 25 Sep 2018 04:52:59 +0000 (21:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Sep 2018 04:52:59 +0000 (21:52 -0700)
commit7d92087ec183ff5f80e8d7f359a3a999f57724bc
tree002414e050a88093521802d9179e8fbcfdf60922
parent09365b47d2489d66717b3a9fcfc430c72f004a83
parentaf09b4eae26d2f1617d76a8fc3d5f48948a1e911
Merge changes I737a864e,Idc41b2a5
am: af09b4eae2

Change-Id: Icdf4f89ec9d36f680f20d54633bd18d23b88c0fb