tree 04b9aaed11912d5dd0c6d29fea4998b40ee76a81
parent eadf3152ac71307c95d932c1f310f5a46fd409b2
parent 4cae67577f4f7f04378527cacaa7849500bd44d4
author Wenyi Wang <wenyiw@google.com> 1455931321 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455931321 +0000

Merge "Add activity, file paths and fileProvider to manifest (AOSP)" into nyc-dev