tree ce133fda053a45fa0971d0990d85b9afe10c293b
parent 89ef5e7fdf34ee3650f8d5d3d69da0123d0c62e8
parent 724e51e88dea60401102d00ecf87b63f565e09bf
author Hyunyoung Song <hyunyoungs@google.com> 1461207185 +0000
committer android-build-merger <android-build-merger@google.com> 1461207185 +0000

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

* commit '724e51e88dea60401102d00ecf87b63f565e09bf':

Change-Id: If4fb5799c28e7f1a1f12be3b1f9fd517cf5c3f39