diff options
| author | Robert Carr <racarr@google.com> | 2016-06-15 01:20:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-15 01:20:20 +0000 |
| commit | e4a0fa46dd31dd4f1130223289bb0bb39e178dea (patch) | |
| tree | 82a37fedd316dca059217f74c87e6711c034c2cb /docs/html/sdk/api_diff/21/changes | |
| parent | 3cff553f3aef4edf56647873258d0f83463bdf1d (diff) | |
| parent | 5077dd948f4c86fb5b69343bf2f62e592ca3755d (diff) | |
Merge \\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\" into nyc-dev am: 3e5df9fb50
am: 5077dd948f
Change-Id: Iebfc46bb349456e11937fdfa82a8fe6a5a15d950
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions