tree 857096dd7b862372f5bc5f2536f9e034be752130
parent 8dc0d9b3a5194f380be736c89f3d92a5ea1f1cee
parent 22ebbd4545ea2bc68c9c28f0d26eaa987a538605
author Chiao Cheng <chiaocheng@google.com> 1381171395 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381171395 -0700

am 22ebbd45: am 0d46793e: Merge "Add content description for dismiss badge button." into klp-dev

* commit '22ebbd4545ea2bc68c9c28f0d26eaa987a538605':
  Add content description for dismiss badge button.