Mårten Kongstad 7672daf8e5 Merge changes from topic "idmap2-prerequisites" ...

am: 62a5d4249f

Change-Id: I8db3f5ba0de6510c3327273c56e9fcc75c836694

2018-10-09 16:00:31 -07:00

..

java

Merge "Add Call Redirection Default Application in Settings"

2018-10-09 11:36:25 -07:00

jni

Merge "Respect extractNativeLibs in natively bridged environments"

2018-10-08 08:05:41 -07:00

proto

Merge "Add yanglu@ and yaochen@ to the proto owner list."

2018-10-09 10:02:21 -07:00

res

Merge "New Permission for Call Redirection service"

2018-10-04 12:47:28 -07:00

tests

Merge changes from topic "idmap2-prerequisites"

2018-10-09 16:00:31 -07:00