| commit | ca4def2ac84231634c04c985d32998c1cb6775c7 | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Mon Jun 26 19:28:24 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 26 19:28:30 2017 +0000 |
| tree | a43144d0ff1fe2b91899cf989b97323e3b8c41b1 | |
| parent | 32974e07056b3a7858bf697345c1edce7587602e [diff] | |
| parent | c99c0e2297f7f8e8b532d39a55c5114c62e8d101 [diff] |
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev