tree f194078f16b7ba6224fc64bca267cb89852d48f2
parent e1faff16014c270f17e308605ebd199da0559ce5
parent 0672ea446d2de2e862aee1f2cd957a907efd194e
author Jordan Liu <jminjie@google.com> 1480550822 +0000
committer android-build-merger <android-build-merger@google.com> 1480550822 +0000

resolve merge conflicts of a578ae2 to stage-aosp-master am: cee0c941ed
am: 0672ea446d

Change-Id: I441ab7f8fd1fb71cc1bf38fe7450a0f9ecdccee0