tree 44e5c393572a77009ede90b72becb4be37a8c056
parent b70bb9f7617b8c111b213abdba77db79b110a7eb
parent e5b621a6af4a6baf0f6805b9c946ec3e4dfbf5b4
author Fan Zhang <zhfan@google.com> 1523302313 -0700
committer android-build-merger <android-build-merger@google.com> 1523302313 -0700

Merge "Allow 3 variants of icon size in TwoTargetPreference." into pi-dev
am: e5b621a6af

Change-Id: Iab570d7d755d56637c337d8b64b5a0f752fa9c09