tree 79136da393c45d9a05a265e97646dc02187cf526
parent c80df295a5e378d936da380a278c6b392e41403d
parent fddb4b4caa808291e28d7006c50df5e56b98cc0d
author Dianne Hackborn <hackbod@google.com> 1279154572 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279154572 -0700

am 0a48a1f3: am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread

Merge commit '0a48a1f31dcfb152c166ff5621942c950f8cca72'

* commit '0a48a1f31dcfb152c166ff5621942c950f8cca72':
  Argh oops I didn't mean to delete this.