tree 257a17bed4a13f1d03f12f7b8eca3c222425028d
parent 290da480f5b0ff194e72ab50fcbbfe1082756421
author Bill Yi <byi@google.com> 1481066816 -0800
committer Bill Yi <byi@google.com> 1481066816 -0800

Manifest update after merging with nougat-mr1-dev

BUG:33270964
Change-Id: I06c4ea82963073c58619b61721633485dd4ff009