tree 8ed67be8e6cce7c3c9ea3b0e4a6398e76b66a782
parent 3d91a35182cb15675e4fda87ffcab529ae4c3fd3
parent 9225761c8d031c7e8a10062fb8e8d50db3b726ff
author Chia-I Wu <olv@google.com> 1511212058 +0000
committer android-build-merger <android-build-merger@google.com> 1511212058 +0000

resolve merge conflicts of 8a2135344 to stage-aosp-master
am: 9225761c8d

Change-Id: I400d6283d3a2c1da881178ee61bfb4b303c9a1b8