| commit | 5217d2a8d3946cff65e7b0558eb5fe3c908f747a | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Tue Mar 20 18:20:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 20 18:20:33 2012 -0700 |
| tree | ac5274c5f00b1479283f17ea6122acb544579e03 | |
| parent | 19b54cad221d205eebcb424c7f293422125fe12b [diff] | |
| parent | eb99caccd7165385fc83b0175c6d176c990f179b [diff] |
am eb99cacc: am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp * commit 'eb99caccd7165385fc83b0175c6d176c990f179b':