tree 4977bf053119fcee93154f403252681b4b909af0
parent f8574f865b03a4f4503e09a7fec36c059363e0cb
parent 8cb9a9e6ba602cc4a2da334fcec966e7f06c63a4
author Alan Viverette <alanv@google.com> 1412986961 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412986961 +0000

am 8cb9a9e6: am 284559bf: Merge "Fix inset drawable\'s intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev

* commit '8cb9a9e6ba602cc4a2da334fcec966e7f06c63a4':
  Fix inset drawable's intrinsic size, replace ic_text_dot asset