tree dd63bc310b2b4e6fbdc4658541d20b99c214c3aa
parent 60684fb1443bba85b6eb5dc1a633e59c5b6afccf
parent 9f3a0c3d5171f49111e11a62b6ff746a7838afe0
author Mathieu Chartier <mathieuc@google.com> 1524081384 -0700
committer android-build-merger <android-build-merger@google.com> 1524081384 -0700

[automerger skipped] Merge changes I16fde69b,I6c085137 into pi-dev
am: 9f3a0c3d51  -s ours

Change-Id: Iae9a7387b9a972095664ecc2a3da2bf1dea7f546