tree 1f3dc704449f21a8a62c15af73550af37a1ad59b
parent 9d7eccb782ec7f09eda02d47719fd53ffd6359c0
parent f901ea773db9b4e8f2d226661a2380573c14425a
author Jae Shin <jaeshin@google.com> 1505891188 +0000
committer android-build-merger <android-build-merger@google.com> 1505891188 +0000

resolve merge conflicts of 8007bdd7d to stage-aosp-master am: 5c34e4895c am: cc7762c629
am: f901ea773d

Change-Id: I47c25768e223ffda152a6f973e4043498d138d44