tree ffdb0df7c9d90e9431c7d82ae622ea94173fc4e8
parent 514be1cd565e0b706726ffc67cfdee307e0f3af2
parent caf2eef6111d83d17b89f348f8f710cec0d35223
author Colin Cross <ccross@android.com> 1507762641 +0000
committer android-build-merger <android-build-merger@google.com> 1507762641 +0000

Merge changes from topic "neven" am: b06c7cc52e
am: caf2eef611

Change-Id: Ic4b486daf9155d17bbcf6bb08b96635d63dcce8c