| commit | d296b167629fcdcdfbcb6ac105900085ae6e59f4 | [log] [tgz] |
|---|---|---|
| author | Danielle Millett <dmillett@google.com> | Tue Nov 15 13:11:08 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 13:11:08 2011 -0800 |
| tree | 7763de841ce8593e3120f11384234ea492217b0f | |
| parent | 0988cddae508cf9e479103fd63a342441bcad25c [diff] | |
| parent | 8b6b92ea5e257cd9d5799b74f64e7e1cc1ca3ddc [diff] |
am 8b6b92ea: (-s ours) am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 * commit '8b6b92ea5e257cd9d5799b74f64e7e1cc1ca3ddc': DO NOT MERGE cherry picking from MR0 cl 148223