tree 4791c34bde2602501d9d6d988c9b148587cb2afa
parent cf5c1bc87d92851739dbe81db398a5d09dd97871
parent 3295d1993a1ddbfe17c5d5750f2ca975359662b2
author Tianjie Xu <xunchang@google.com> 1464999548 +0000
committer android-build-merger <android-build-merger@google.com> 1464999548 +0000

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

* commit '3295d1993a1ddbfe17c5d5750f2ca975359662b2':

Change-Id: Id26f893567cdb867322de9f745aaf78510e2cd5c