am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp

* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
  Fixing self-assignment in cloning code.
This commit is contained in:
Brad Fitzpatrick 2011-03-15 11:57:44 -07:00 committed by Android Git Automerger
commit 222c36322b

Diff Content Not Available