tree ce133fda053a45fa0971d0990d85b9afe10c293b
parent 1b1b84e96a30b30d1df11948eccdf3bb0a821233
parent 3e906a925c05824546c48776836a6f727271f625
author Hyunyoung Song <hyunyoungs@google.com> 1461199325 +0000
committer android-build-merger <android-build-merger@google.com> 1461199325 +0000

resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp
am: 3e906a925c

* commit '3e906a925c05824546c48776836a6f727271f625':

Change-Id: I9dce3069f215363b02c42d569e559cdf20998ddb