OSDN Git Service

Merge "Reduce toast duration for channel warnings." into oc-dev am: f6e956b1c6
authorGeoffrey Pitsch <gpitsch@google.com>
Tue, 30 May 2017 15:51:49 +0000 (15:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 May 2017 15:51:49 +0000 (15:51 +0000)
am: c1dc15e8d0

Change-Id: I7c837df3a91727be805109dd8608b1e76761daec


Trivial merge