tree 485b152b97bf8321fdd223f35587bb4294672be8
parent fca28397705aa75d252712647e7e509fe7f2f810
parent 0dc1f704b239853c322aca94a7615f1331db9e2b
author Roman Nurik <romannurik@google.com> 1326243845 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326243845 -0800

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

* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design