tree 1d3106681f88d0018c2e7a8cd1623a432b35674d
parent 5695ff4eea3bb99f41ba4942d3ab4622f6c0f5d7
parent 19e838ba3944f0a18c21fb396cfaf6c9f6db2c7b
author Jesse Hall <jessehall@google.com> 1462398625 +0000
committer android-build-merger <android-build-merger@google.com> 1462398625 +0000

resolve merge conflicts of 0b546c4 to nyc-dev-plus-aosp
am: 19e838ba39

* commit '19e838ba3944f0a18c21fb396cfaf6c9f6db2c7b':

Change-Id: I3f2abe0bd09964acce10ff2a84b17ba9e57b1427