tree 670590040e088b10b7d2d591c55fe2d81ef5ce93
parent e20e7ebbfb39a52e95c72c6abbf1409a2a9abc44
parent eac19cd55d63bc561b54925cc1763bc1ad738a1f
author Jason Monk <jmonk@google.com> 1487950067 +0000
committer android-build-merger <android-build-merger@google.com> 1487950067 +0000

resolve merge conflicts of 1723bc14ebfd to stage-aosp-master am: 4f458421b1
am: eac19cd55d

Change-Id: Iec06900eba071a56696a1c240b79f0dd7ab05d70