tree 3da449ceee0e05c05c81859a9735544fa58a4dfe
parent e52210a6db3f3cfca8195b41afb170a71c08dee0
parent bf049bffe2ea70e788e5c54ca307839232eb2f5d
author Yabin Cui <yabinc@google.com> 1466532875 +0000
committer android-build-merger <android-build-merger@google.com> 1466532875 +0000

resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp
am: bf049bffe2

Change-Id: Ie5f358c52a894ed76a71c7684dee5350d7636c40