| commit | 7c66a417695ff71f60a93305a5e217e1cac6feac | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Jan 30 12:37:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 30 12:37:07 2012 -0800 |
| tree | fc892d5bb23e67ce35c74b97ce499372c4c0510f | |
| parent | 46fc6416236ba78b6c00b5e7e382281fd8fa2b15 [diff] | |
| parent | b12ad76ee0e2cfd91b1c3275e263ede90f278ed5 [diff] |
am b12ad76e: (-s ours) am c5b2cbd5: Merge "DO NOT MERGE Update Test ICS MR1 Expectations" into ics-mr1 * commit 'b12ad76ee0e2cfd91b1c3275e263ede90f278ed5': DO NOT MERGE Update Test ICS MR1 Expectations