tree a450cea67ace1f69c2b84eb511da213ec193ffd0
parent 5e1532a8eab10f73da157d047c9d4c03e1702e9e
parent bb7e1b68e6ce2ec44a716080bcf42bed87c8a90a
author Ian Elliott <ianelliott@google.com> 1500408202 +0000
committer android-build-merger <android-build-merger@google.com> 1500408202 +0000

resolve merge conflicts of 8a094116b to stage-aosp-master
am: bb7e1b68e6

Change-Id: I453a7aaf28c20634337ac70ea6586d5a10d4736c