am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread

Browse Source

Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp

* commit '154a320069a316491c25b716f2aeea8c51a758e8':
  fix inaccurate copyrights

...

This commit is contained in:

Jean-Baptiste Queru

2010-07-30 12:13:43 -07:00

committed by Android Git Automerger

parent 8e258000e8 154a320069

commit 6a5ed6aa9d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available