Manifest update after merging with lollipop-mr1-dev
1 file changed