tree f814f3232548b4cb6074e42e97e0e4a9ba196576
parent aec8fbb354621dc49a4ac971a64706bee01e5806
parent 5357f8fd24bc578a1a584cac9c1943227816ea05
author Jim Miller <jaggies@google.com> 1382731922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382731922 -0700

am 5357f8fd: Merge "Remove \'?\' icon in layout for "Forgot pattern" button" into klp-dev

* commit '5357f8fd24bc578a1a584cac9c1943227816ea05':
  Remove '?' icon in layout for "Forgot pattern" button