tree 00b225b6f3b648442bf24e75e536700ac3d259c5
parent 675e05c48a8cca68db101d1a3117068996385262
parent 56e89ade33c649412999d2663acc2f12ca9873a8
author Josh Gao <jmgao@google.com> 1488851711 +0000
committer android-build-merger <android-build-merger@google.com> 1488851711 +0000

Merge changes Ib69a206f,If57cc175
am: 56e89ade33

Change-Id: Id6d1428be5519ab3ad4694cc4dea9ea96ff62d2e