resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp

am: 3e906a925c

* commit '3e906a925c05824546c48776836a6f727271f625':

Change-Id: I9dce3069f215363b02c42d569e559cdf20998ddb
This commit is contained in:
Hyunyoung Song authored and android-build-merger committed 2016-04-21 00:42:05 +00:00
commit 724e51e88d

Diff Content Not Available