tree 44513019358dc467a18bec7650e594597511ef96
parent b5fed003cce94a92be1f35a28f35815f2d23b296
parent ab005465b6e1ce252c0573ee1ae5917971707df4
author Jordan Liu <jminjie@google.com> 1477506294 -0700
committer Jordan Liu <jminjie@google.com> 1477508727 -0700

resolve merge conflicts of ab00546 to stage-aosp-master

Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49