| commit | ac571749a577c3575793f870e95012ce6637f977 | [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 | 4ae50955c496fae48bf6f3a685fac665c4840573 | |
| parent | 4fd8374fd8ece64599089895d554be73743e7193 [diff] | |
| parent | c39aa13da5600571affee13ea8ef3936cc39cbb5 [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