OSDN Git Service

Merge "Settings should use Oxford comma" into pi-dev
authorBeverly <beverlyt@google.com>
Thu, 29 Mar 2018 16:09:50 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Mar 2018 16:09:50 +0000 (16:09 +0000)
am: 51646b5f07

Change-Id: I94ac135a10015933a2dc7e2d5d0b7d8f72b6b865


Trivial merge