| commit | 8d901bf872490c4ab60712b6711d090f5bcaa5b3 | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Mon Jun 26 19:52:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 26 19:52:26 2017 +0000 |
| tree | 59750f7a5c651dbc933bb848d77a22f51948d2db | |
| parent | 60be57d87fc124f241ce6e09e55071c04c32bcc9 [diff] | |
| parent | 21e21efcf964f6435318d21af02e725fc6bf5462 [diff] |
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev am: ca4def2ac8 am: 21e21efcf9 Change-Id: Iaab165b6465d15f0a960144798c1920fd30ab688