Yi Jin 5731a280e0 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 ...

am: 7d1357723d

Change-Id: I686fd6899993395e722713bc06f0bdd4ff2db8c1

2018-04-03 16:06:16 -07:00

..

java

Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev

2018-04-03 14:41:56 -07: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-02 20:36:36 -07: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 11:27:50 -07:00

tests

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

2018-04-02 22:58:26 +00:00