OSDN Git Service

Merge \\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\" into nyc-dev am: 3e5df9fb50
authorRobert Carr <racarr@google.com>
Wed, 15 Jun 2016 01:20:20 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 01:20:20 +0000 (01:20 +0000)
am: 5077dd948f

Change-Id: Iebfc46bb349456e11937fdfa82a8fe6a5a15d950


Trivial merge