Jeff Sharkey 28f6dc9512 Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37 ...

am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216

2017-06-06 16:17:39 +00:00

..

android/telephony

Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37

2017-06-06 16:17:39 +00:00

com/android

Merge "Added video calling data usage per-uid support" am: 36fdb346f2 am: 2f74c02826

2017-06-01 05:53:47 +00:00