| commit | 2ae29ff0edfe4211f5a8a61577dea6ffd260444d | [log] [tgz] |
|---|---|---|
| author | Roy West <rwest@google.com> | Thu Oct 21 17:59:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 17:59:54 2010 -0700 |
| tree | 8bf0de3ef0c79530b2bd511daa84a2353a1898f1 | |
| parent | da7eb065b6b46aeaed812c358f7f456e9732a4e0 [diff] | |
| parent | d2927990ffe0d8ac385e16a38c189ace00065cff [diff] |
am d2927990: (-s ours) am 69827524: Try to fix bug3119318 without breaking the build this time Merge commit 'd2927990ffe0d8ac385e16a38c189ace00065cff' * commit 'd2927990ffe0d8ac385e16a38c189ace00065cff': Try to fix bug3119318 without breaking the build this time