Manifest update after merging with lollipop-dev
1 file changed