tree 84b80d9ab3f43650df29a07cb3c24065e37c1e7f
parent 22f140d66305760076ab34626eb093a6eb3f6f04
parent 8ed24ceef30dd0bb92d6477b0eaa10367749068c
author Yi Kong <yikong@google.com> 1528560659 -0700
committer android-build-merger <android-build-merger@google.com> 1528560659 -0700

[automerger skipped] resolve merge conflicts of aabd6b7fa343654cd85b3b2da392e424d037d15a to pi-dev-plus-aosp
am: 8ed24ceef3  -s ours

Change-Id: Id22d70818ac8f7a4d64bec2c38408dc48be5de72