| commit | c39aa13da5600571affee13ea8ef3936cc39cbb5 | [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 | b0f6ea9ea6e28ddd2cc25d21396a66ffe5336f3f | |
| parent | 1a082f3061c2a444ac6602f321aa334589167f07 [diff] | |
| parent | bfa2f13fd3f463dbceea4d3a18c3124e70df0a05 [diff] |
am 2ba92c71: do not merge bug 3370834 Cherrypick from master * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master