| commit | c7c8375bad086263ca1e14d08e03a69e4a3b1651 | [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 | 8ec033794cd34cfcf513f4bf6b50754c73bf881f | |
| parent | e341547e2931b4aae4681053491ba5ccbab06e6f [diff] | |
| parent | 9c450b31c18d0995ded7aae7552a0db36654c62e [diff] |
am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp * commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':