tree 15df53991e14e028f97c18ba55ba0c080f167c5c
parent e7660e56ad330c8469857014c448130143c86856
parent 0c672afc4052f162eab990fa5bd97f09ab2f927c
author Zach Jang <zachjang@google.com> 1466558869 +0000
committer android-build-merger <android-build-merger@google.com> 1466558869 +0000

resolve merge conflicts of 12db224 to lmp-mr1-dev
am: 0c672afc40

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45