Skip to content
Commit 21e21efc authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev 

am: ca4def2a

Change-Id: I9b847d08144f484bb68a293c0be258fb52fdeb92
parents 4e5e0fe0 ca4def2a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment