| commit | 729eb83d68268c391e3b1c9e2257bde3c98820e3 | [log] [tgz] |
|---|---|---|
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | Tue Jan 10 16:30:38 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 16:30:38 2012 -0800 |
| tree | 26a55a91c32ebef187c74260fef49925a6ef18ee | |
| parent | 1feff62f3660396442b88bb23865d2f37e50d8ab [diff] | |
| parent | 88ffed14ce314a8e1feb17b701dce8074516f92c [diff] |
am 88ffed14: (-s ours) am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge. * commit '88ffed14ce314a8e1feb17b701dce8074516f92c': Cherry-picked from c4f37eed7 in master. Do not merge.