tree e537874b5b695cb61fcf97470155ad4b7468816e
parent b53120681e9d182592da27096e6dd6016d11fa18
author Bill Yi <byi@google.com> 1415328953 -0800
committer Bill Yi <byi@google.com> 1415328953 -0800

Manifest update after merging with lollipop-dev