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/location

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

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

com/android/internal/location

Merge "Added Channel for Network Initiated Notifications" into oc-dev am: 84ed81ed39

2017-05-02 23:27:43 +00:00