tree e80493fadfbea81163acad933e8c82620235d8fb
parent 81e54eddd4132895d70ab8b2307c693311799e05
parent 2a576e20975b9a12610d19c3d782045b7fa227b8
author Tao Bao <tbao@google.com> 1476832085 +0000
committer android-build-merger <android-build-merger@google.com> 1476832085 +0000

resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ff
am: 2a576e2097

Change-Id: Iee6000f594a04a0862b3687f1d87daa809fb3804