| commit | 1155efdc715413cd7a881e5226b5f5f0b2db8f71 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Jan 26 14:05:18 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 14:05:18 2011 -0800 |
| tree | cc5ae04c7c3ca6665503d96470160d93ee28ea8f | |
| parent | 2ec4af59209ab3a7088a001bbbcb10ef0b846564 [diff] | |
| parent | 2ba92c71b5684dce700cf848bf157153c156df1d [diff] |
am 2ba92c71: do not merge bug 3370834 Cherrypick from master * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master