OSDN Git Service

resolve merge conflicts of 55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp...
authorNeil Fuller <nfuller@google.com>
Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)
commitf18981698dc3e4d55bc1e1c6648fe62deb317674
treedfb2fee40e839552fddebdce17c778eaffe9a129
parent7f315a5c3c9487d42529c03b52d9ce4a83d775b8
parente01a7adf5ac0113edc15699d8e45b376f368be76
resolve merge conflicts of 55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
am: e01a7adf5a

Change-Id: I993dc856b8fe0f42d7ad5f766727be32d3d611fe
Android.bp