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

* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design