OSDN Git Service

[automerger skipped] Merge changes from topic "encap-api" into pi-dev
authorBenedict Wong <benedictwong@google.com>
Fri, 30 Mar 2018 22:57:46 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 22:57:46 +0000 (22:57 +0000)
commitd3b9df79e3975d57380e6531d23517b5b0e2f516
tree8becb0e82071333ae482f1237589ea42e667f5ce
parentbdad02b32b0b1dcb142a3225327d4376837268cb
parent36f2d8a4e1247b4556d10691eb8e40b26122f92c
[automerger skipped] Merge changes from topic "encap-api" into pi-dev
am: 36f2d8a4e1  -s ours

Change-Id: I19ea85409c7b8653a734e74afc092959e91a0aad