am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1

* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
  Android Design