tree d1a43430c73d757337b181a1fa7a2c4a687ad47e
parent 7159712f283b6ffe07a27aeb374e352c4ab78772
parent c37a5742a263605495c28875a03ca2cf97cca6b9
author Benedict Wong <benedictwong@google.com> 1522450666 +0000
committer android-build-merger <android-build-merger@google.com> 1522450666 +0000

[automerger skipped] Merge changes from topic "encap-api" into pi-dev
am: c37a5742a2  -s ours

Change-Id: I19ea85409c7b8653a734e74afc092959e91a0aad