| commit | b8efdf7f80d9aa2cbeff881f22d283cf5045c379 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Jan 26 14:12:45 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 14:12:45 2011 -0800 |
| tree | 55cbeb370ed56a2afd52cc9b9203ad80ba07bf20 | |
| parent | 203107d4901704c33eca2e5f7e5cd967fd372bbe [diff] | |
| parent | 1155efdc715413cd7a881e5226b5f5f0b2db8f71 [diff] |
am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master * commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71': do not merge bug 3370834 Cherrypick from master