| commit | 1feff62f3660396442b88bb23865d2f37e50d8ab | [log] [tgz] |
|---|---|---|
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | Tue Jan 10 16:22:30 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 16:22:30 2012 -0800 |
| tree | 26a55a91c32ebef187c74260fef49925a6ef18ee | |
| parent | ceabb17306f4de9850516dae96bb0d2d5853f028 [diff] | |
| parent | 8642b9b0c757f9e1fcd091aad6ce1b97e16724e2 [diff] |
am 8642b9b0: (-s ours) am 74159657: Cherry-picked from c13daef7b on master. Do not merge. * commit '8642b9b0c757f9e1fcd091aad6ce1b97e16724e2': Cherry-picked from c13daef7b on master. Do not merge.