tree 302e2624b6cba4898c91616e50d8594a2e049e7f
parent 653642bbfd6aef9b468c3632a112829d32d0ec99
parent 667035cb00787b57a59e737f2af928ceebf918e4
author Michael Kolb <kolby@google.com> 1369266422 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369266422 -0700

am be4f113f: Fix editor on ICS

* commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba':
  Fix editor on ICS