commit | 28f6dc951223a017f9abc90599662cb3f4995ad1 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Tue Jun 06 16:17:39 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 16:17:39 2017 +0000 |
tree | b0b9563a9afbff8e02eadcf4ba1e8fefcd64c639 | |
parent | 3de8df76b5f2f7d4aa2f37a1b7c1d0100fc94059 [diff] | |
parent | 67cb5f5210dd53d6e4726ab77bc5fc5164ab1a3c [diff] |
Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37 am: 67cb5f5210 Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216