tree 270f2b3609a959a34b2a3eac4489ff4996f35868
parent cf6cf306e6645670019f4a4b2a70ccdb5b6b7e3e
parent bd7bd1be80f5baca04bb4e4594df1c84e6e0658d
author Nick Kralevich <nnk@google.com> 1481117578 +0000
committer android-build-merger <android-build-merger@google.com> 1481117578 +0000

resolve merge conflicts of a71003d to nyc-mr2-dev-plus-aosp
am: bd7bd1be80

Change-Id: I237eb410733996700b098c73ba625290648647dc