tree 8a401bd9adff427425b6738e6c92faaaee8aae7f
parent 6b2214024e0e0615d97346f8ee3114f726333896
parent 9cd6f0c9a6e295d023d21facd4c5b25c886543db
author Jordan Liu <jminjie@google.com> 1476906816 -0700
committer Jordan Liu <jminjie@google.com> 1476906816 -0700

resolve merge conflicts of 9cd6f0c to stage-aosp-master

Change-Id: I33cbbca4e8b994c811cf168b027c7a3db8fb1cc6