Eric Laurent f3c6967b17 am 88316f70: am 0bf3ac2c: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '88316f709083652c4aa9eca6f64631c0ec77fb07' into eclair-mr2-plus-aosp

* commit '88316f709083652c4aa9eca6f64631c0ec77fb07':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:42:53 -07:00
Description
No description provided
1.3 MiB
Languages
C++ 90.2%
Objective-C 4.6%
C 2.8%
Makefile 2.4%