tree d3f5b9a0008ddbf53ae3e623271a0ec0dda47072
parent 63500ac1b0c701ea5eba34eaf2fc8e09905b02c9
parent f341270e30dd82bf004f2b87cacae1482ca4d50e
author Iliyan Malchev <malchev@google.com> 1243385727 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243385727 -0700

am f341270e: remove a *.orig file left over from a merge

Merge commit 'f341270e30dd82bf004f2b87cacae1482ca4d50e'

* commit 'f341270e30dd82bf004f2b87cacae1482ca4d50e':
  remove a *.orig file left over from a merge