Manifest after merging Marshmallow dr - DO NOT MERGE

Change-Id: I3b239e99d5a3804aebbc460aa96bf86dac05011f
1 file changed
tree: fe5851bfdcdef2c11628c95110196c75d8e6d6a5
  1. default.xml