commit | 31eece5af927cbb06a96bf72ab59e27bc8909461 | [log] [tgz] |
---|---|---|
author | Robert Carr <racarr@google.com> | Wed Jun 15 01:12:03 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 01:12:03 2016 +0000 |
tree | 4b442d376f04bd7b1c3e769f59c97b069e700588 | |
parent | 2da8166a68f3706ceeaab517506de479e32346b7 [diff] | |
parent | 3e5df9fb50f98ae3738bef5c8dbddcbbb4a4b95d [diff] |
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev am: 3e5df9fb50 Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3