tree 917f61a8f81512485789c34cfe09d7e7cb605802
parent 8142499cdbd2c35a6da484aed827256bc9feded5
parent 0f7856add6490b2915ae5ff0c52c42e7b82c7c09
author CY Cheng <cycheng@google.com> 1534462898 -0700
committer android-build-merger <android-build-merger@google.com> 1534462898 -0700

resolve merge conflicts of e58c7805711b76fcb92fad0b7c4a57651176cf50 to stage-aosp-master
am: 0f7856add6

Change-Id: I7b763616c1244d3f834e33c3d6e7126c0baa1b59