| commit | 6fa18274e5435ba29e9bb3df812fbe980620895c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Feb 02 14:31:53 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 02 14:31:53 2012 -0800 |
| tree | a5afcdafc3b35472626af8eb72bba772cdb6eafb | |
| parent | ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b [diff] | |
| parent | 175f4154a6c0ff0917d56d67a1ad22d883eadda2 [diff] |
am 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp * commit '175f4154a6c0ff0917d56d67a1ad22d883eadda2':