| commit | eb99caccd7165385fc83b0175c6d176c990f179b | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Fri Mar 16 17:26:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 16 17:26:15 2012 -0700 |
| tree | c43d7f5699eb79d5980b8b000914fee27a7fba81 | |
| parent | 04353390722b9195434cc86af4414004eff058e8 [diff] | |
| parent | b388138ff2986d6883fa9331fa91ae5e18ae81a0 [diff] |
am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp * commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':