tree 1195ea8c8e58a05cda0ca72adb9f10a41ce73959
parent 726616f2f3d6b85db0264028bc83f27e1bd14a09
author The Android Open Source Project <initial-contribution@android.com> 1444151484 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1444151484 -0700

Manifest after merging Marshmallow - DO NOT MERGE

Change-Id: Ie9d45ad25fe9c08ba513171a8e941eb017dd26ac