tree 92ae3e1e4728445473b5a751896676a001396f8c
parent 416ff0ab91bad1cb5cf50f2c1e91dc2c3cb523e0
parent e81224d80c3af797003a40f06fc7563728a0da96
author Lei Yu <jackqdyulei@google.com> 1540833301 -0700
committer android-build-merger <android-build-merger@google.com> 1540833301 -0700

[automerger skipped] resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp
am: e81224d80c  -s ours

Change-Id: Ic45574c2b07d33682ef8f68518c7ee99d38d171c