Christine Franks 21e21efcf9 Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev ...

am: ca4def2ac8

Change-Id: I9b847d08144f484bb68a293c0be258fb52fdeb92

2017-06-26 19:41:24 +00:00

..

java

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

2017-06-26 19:41:24 +00:00

jni

Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp

2017-06-26 10:12:56 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6

2017-06-26 18:28:44 +00:00

tests

Merge "Remove a.t.TestCase" am: 3c5ab7d324 am: 930ab689f0

2017-06-26 14:50:38 +00:00