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