OSDN Git Service

resolve merge conflicts of 81a28efd1b16 to stage-aosp-master
authorTyler Gunn <tgunn@google.com>
Wed, 1 Mar 2017 16:51:27 +0000 (16:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Mar 2017 16:51:27 +0000 (16:51 +0000)
commit63700b7a8f1d2f6250de39e06fa6a984eb487c4d
treed55809d9a9d7de842e2daff5d451932cf8383743
parent3ddaf3e6b0ca5ef365e2f4f14bc980889b212427
parentb455f0deed3dd38dea5c89984d1c0e47f17cbf08
resolve merge conflicts of 81a28efd1b16 to stage-aosp-master
am: b455f0deed

Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f