tree 11013661e57bcee5628e4604465644f318d0932d
parent e64ff87cdd059c1ef9eb7b8b913f6e8ea279ed6f
parent 68cf75c58ecc3fbf3a24189443490608efcc9caf
author Michael Chan <mchan@android.com> 1365801702 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365801702 -0700

am 68cf75c5: Merge "Per "designer" request:" into jb-mr2-dev

* commit '68cf75c58ecc3fbf3a24189443490608efcc9caf':
  Per "designer" request: