commit | 59b9326d8e2abdd4b67b4c0a64a4b6af01d304ec | [log] [tgz] |
---|---|---|
author | Eric Laurent <elaurent@google.com> | Mon Jan 24 00:02:04 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 24 00:02:04 2011 -0800 |
tree | 99d0f5c090bb7b4d96bd95b446910cbcbea4fd80 | |
parent | 939bd35c377862ed76bd1b5c634efd1e3f2e9a98 [diff] | |
parent | 2b61341c6308b99254b504a7fa9d890200796369 [diff] |
am 39999e3a: (-s ours) am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread * commit '39999e3af59599051c6ae0fc8d90cd4bda67ead3': do not merge - Fix issue 3371096.