tree 51836dd6cab7cf408a711fbb6bd6def57859c1a1
parent 1ff7a68fe84e0a2ba1edb0972f0e561bdb77c61c
parent cee0c941ed9c8fdb1379dcc92c3d75ef5f39750d
author Jordan Liu <jminjie@google.com> 1480550455 +0000
committer android-build-merger <android-build-merger@google.com> 1480550455 +0000

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

Change-Id: I39f3256a13117c2afe6872f58f57c18c308eab30