Selim Cinek e1fcf8edd6 Merge changes If96c0146,I0d68ad60 into oc-dev ...

am: 5393a0e2d9

Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de

2017-04-07 16:08:26 +00:00

..

java

Merge changes If96c0146,I0d68ad60 into oc-dev

2017-04-07 16:08:26 +00:00

jni

Merge "Change requestWait API according to request" into oc-dev

2017-04-07 13:19:12 +00:00

proto/android

…

res

Add NETWORK_STACK permission

2017-04-07 05:37:21 +00:00

tests

Merge "Collect background stats: scheduled jobs" into oc-dev

2017-04-05 22:23:15 +00:00