tree 7450e7b9628dc45c39337fe636f719e105d5dd27
parent 894176632c7295875d01cfdc273b706996c483a4
parent 64f46fb16ccae69f7a826585c5eaba48fe1b05da
author Tianjie Xu <xunchang@google.com> 1464996565 +0000
committer android-build-merger <android-build-merger@google.com> 1464996565 +0000

resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp
am: 64f46fb16c

* commit '64f46fb16ccae69f7a826585c5eaba48fe1b05da':

Change-Id: I2385636728c2d1f874d8c8b72f38237b2f8d5be9