| commit | 79ba73dace022c47a97258c937e463528f796be1 | [log] [tgz] |
|---|---|---|
| author | Danielle Millett <dmillett@google.com> | Thu Jan 12 07:33:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 12 07:33:47 2012 -0800 |
| tree | 12823493d1b9718500ad69feb1d6670900863b88 | |
| parent | 1f3c500febd8f3a3271015bb4a59161161fded75 [diff] | |
| parent | 7c92558beb2d8d3ef2d268a849ca84e467bf9d4f [diff] |
am 63faf6c6: (-s ours) am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 * commit '63faf6c66ff129da9e431dbafd1170a14aedb259': DO NOT MERGE - Cherry picking from master to MR1