tree de94363fbe6aa8c540fa719aedd149dd78225837
parent 0dfa7b58b8ed608ff0d8c313aff7c37adef445e9
parent 3aac3ebee1079ba56afde5d149b0653c891cb5a8
author Andrew Scull <ascull@google.com> 1484342191 +0000
committer android-build-merger <android-build-merger@google.com> 1484342191 +0000

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969
am: 3aac3ebee1

Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a