tree dc4453eb79805c228b5392171654748cc02571be
parent 797e4c17fbeca38c837440af8c932bc3bfca5edc
parent 07cb018e7fababba0f14d7ff67be26561bd8c1da
author Mike Lockwood <lockwood@android.com> 1317684078 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317684078 -0700

Merge "Move app_icon_content_size setting to generic dimens.xml" into ics-aah