tree f95e286d46482a15b43058012bec85fb0db690eb
parent d581113dc153e02e9fc5a3e695fbb942dc9582b3
parent bb4aeb19be1dbc93e54860430e87473ca69850d2
author Hyunyoung Song <hyunyoungs@google.com> 1496822338 +0000
committer android-build-merger <android-build-merger@google.com> 1496822338 +0000

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
am: bb4aeb19be

Change-Id: Ie9996ca6a1197dbaf877229c932eba758e15eb5d