tree 65410f83e121df55cbdec80e9b2f746096810cf7
parent 2e55280df2d24c07cc81599b3c56c5965d578803
parent f83101a91150572e6077f08e501b473cd70e15b3
author Tao Bao <tbao@google.com> 1479283326 +0000
committer android-build-merger <android-build-merger@google.com> 1479283326 +0000

resolve merge conflicts of 4f86f26 to stage-aosp-master
am: f83101a911

Change-Id: Icf9b616752ae66802823599ffe9f9d700d47fa04