| commit | 2b2ae79aa23da70e79a2bbe4947f32350ac10799 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Feb 23 12:26:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 12:26:21 2012 -0800 |
| tree | e1de5876e7fcf0e7c042c45efb94a6447363ce79 | |
| parent | c1717c29930ae6b094876a93cdaa46424e88e6ea [diff] | |
| parent | d8d6c4b664d657e707dd7dc8ce9b5979b0262d53 [diff] |
am d8d6c4b6: (-s ours) am b1b8a831: am e66798b1: DO NOT MERGE ICS MR1 Backport of Some Tests * commit 'd8d6c4b664d657e707dd7dc8ce9b5979b0262d53': DO NOT MERGE ICS MR1 Backport of Some Tests