OSDN Git Service

[automerger skipped] Merge "Conditionally block battery percantage from search" into...
authorMatthew Fritze <mfritze@google.com>
Tue, 3 Jul 2018 21:43:46 +0000 (14:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Jul 2018 21:43:46 +0000 (14:43 -0700)
am: 76acf317a5  -s ours

Change-Id: I037b7f21c32474a769d4e870664b3e6d812148f3


Trivial merge