tree 4511c43e2ed24d872bc3142374bdbc255bf7fc22
parent 434697f06b7432a2358550eadd74fb97d617035c
parent 69c117c2ffb71cdbfde71c65d510014e162a1016
author Tao Bao <tbao@google.com> 1476831655 +0000
committer android-build-merger <android-build-merger@google.com> 1476831655 +0000

resolve merge conflicts of e89bf25 to stage-aosp-master
am: 69c117c2ff

Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d