OSDN Git Service

Merge "O no, this should be a P." into pi-dev
authorDaniel Sandler <dsandler@android.com>
Thu, 7 Jun 2018 14:23:27 +0000 (07:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 14:23:27 +0000 (07:23 -0700)
am: 31cb11324f

Change-Id: I7392d863c935ab64fc6445fca4c3b35352ffcf1f


Trivial merge