| commit | f9dc18a36598b8d8c641ef5df67dd9664a84ce1c | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Feb 17 15:16:20 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 17 15:16:20 2012 -0800 |
| tree | 0bdd7ea2fcd5802c18160e25459d8eab8e6436cf | |
| parent | a70e03125d173b5f29f0d9a42b9c8e75508897fc [diff] | |
| parent | 23f8986d92a0dfe0f774afb5a0d5cf2592caec43 [diff] |
am 23f8986d: am 257944d6: Merge "Don\'t Test Zoom Controls" into ics-mr1 * commit '23f8986d92a0dfe0f774afb5a0d5cf2592caec43':