tree a8dfce0306bc63bf772529869a21b33205baf70b
parent 88c10e916916c8f413087fe748ed2dd5ec980e9d
parent e50f5effa07c28305b9463fc2320c151537c8b6d
author Fan Zhang <zhfan@google.com> 1525977143 -0700
committer android-build-merger <android-build-merger@google.com> 1525977143 -0700

Merge "Fix a typo in AndroidManifest.xml" into pi-dev am: 3a9fbac582
am: e50f5effa0

Change-Id: I68689c03344b1987b905b32f95f91d82b5a9e129