| commit | d0ad72f38f472d491c9b2b695c519ab54a841901 | [log] [tgz] |
|---|---|---|
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | Tue Jan 10 16:44:44 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 16:44:44 2012 -0800 |
| tree | 4f1ce5b4cb2dc186bbe73705006213660cb6232e | |
| parent | ea91f0a40ee114588204b9912345d3d8305ee190 [diff] | |
| parent | 021692515734748c2632ce7a59fceed40a5eb9b6 [diff] |
am 02169251: (-s ours) am 2cbcd24b: Cherry-picked from e6b969f3b in master. Do not merge. * commit '021692515734748c2632ce7a59fceed40a5eb9b6': Cherry-picked from e6b969f3b in master. Do not merge.