tree 19bf4543d421883af732440505efad37fcf576af
parent 11ed2c18ebd64b2476cff3c53c027e83a789510c
author Bill Yi <byi@google.com> 1439576993 -0700
committer Bill Yi <byi@google.com> 1439576993 -0700

Update manifest groups tags - DO NOT MERGE

Keeping those tags in sync will reduce merge conflicts downstream.

BUG:23120831
Change-Id: I84bbc5b9dc0bf9e57257c535e6f882c7a5bf7c5b