tree 4b442d376f04bd7b1c3e769f59c97b069e700588
parent 2da8166a68f3706ceeaab517506de479e32346b7
parent 3e5df9fb50f98ae3738bef5c8dbddcbbb4a4b95d
author Robert Carr <racarr@google.com> 1465953123 +0000
committer android-build-merger <android-build-merger@google.com> 1465953123 +0000

Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am: 3e5df9fb50

Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3