Jeff Sharkey 67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev ...

am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e

2017-06-06 15:28:26 +00:00

..

android/telephony

Merge "Give Doclava our manifest; more permission docs." into oc-dev

2017-06-06 15:28:26 +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