Skip to content
Commit 67cb5f52 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 65d4cbba

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
parents 0ffff6a3 65d4cbba
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment