OSDN Git Service

resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp...
authorDavid Brazdil <dbrazdil@google.com>
Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)
commit1efb9d2ec3e20e34a682368dcf7649f0281077ca
treea56623e43ecdef77c6e0ea98f35112ffefbee4da
parentd6f00d85115a5c6a887f29b731cc8aa653996cc7
parentf8d22dec8788d18c5b37adf3b4710691d5d347ed
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
am: f8d22dec87

Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7