tree 718dfe7fce43e9fa471a8e559b01037c815ea6c7
parent 8c73e9c53809687faa1809e5001ee9252da8a1a9
parent 1edbbadd5b56177e83fc46331e51443afd2ae3cd
author Mindy Pereira <mindyp@google.com> 1321410310 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321410310 -0800

am 1edbbadd: Merge "Make sure we correctly identify an edit vs a commit" into ics-mr1

* commit '1edbbadd5b56177e83fc46331e51443afd2ae3cd':
  Make sure we correctly identify an edit vs a commit