OSDN Git Service

Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1...
authorIan Elliott <ianelliott@google.com>
Tue, 18 Jul 2017 21:48:11 +0000 (21:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:48:11 +0000 (21:48 +0000)
commit57c50525133d312ca41504f58ef21c3da58bdf65
tree11d0fdb963b70ea3cf29954974c9c90f7e156208
parent0d0167e6265e1e860f14e925209478363cb57f33
parent72f1824c46fcb8c66f5a92c1328508b831c971ae
Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am: 72f1824c46  -s ours

Change-Id: Id0de85cb32bfc7d90cf048639c4d3a6a21d63a54