tree cdbfbc1ba3091fece6c51f8f6428682d68693d68
parent 86b991076f30e4d0bacabe845218bff37a668aaf
parent 13d685964e8d0c609d3f7dc09b088feebc896a0a
author Jae Shin <jaeshin@google.com> 1505489646 +0000
committer android-build-merger <android-build-merger@google.com> 1505489646 +0000

resolve merge conflicts of 9414ec081 to stage-aosp-master
am: 13d685964e

Change-Id: Icfaa5b8fc380d3a5f0eb64349b638faf8e86c085