Yi Jin 7d1357723d Merge "Based on the discussion of ag/3818243, this is the initial list. The reason to repropose this is because of some changes like ag/3619568. We don't want to allow this happens again." into pi-dev

2018-04-03 20:02:21 +00:00

..

java

Merge changes from topic "omapi" into pi-dev

2018-04-03 19:17:18 +00:00

jni

Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev

2018-04-03 00:28:43 +00:00

proto

Based on the discussion of ag/3818243, this is the initial list. The

2018-04-03 10:31:09 -07:00

res

Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev

2018-04-03 17:57:43 +00:00

tests

Merge "Don't finish activity on duplicate resume request" into pi-dev

2018-04-02 17:58:42 +00:00