commit | 6a9f87fefd2a9fa55972d7af7dfae0a7b1618205 | [log] [tgz] |
---|---|---|
author | Vladimir Chtchetkine <vchtchetkine@google.com> | Tue Jan 10 16:42:45 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 16:42:45 2012 -0800 |
tree | 6394509f7b46698d00ddedc3702d5f2f96a85af6 | |
parent | 2185e61343780ddd5f8b1a2b13fddc53b311bf52 [diff] | |
parent | 2cbcd24ba708be5e387b8bf54351f5c2df7abbec [diff] |
am 2cbcd24b: Cherry-picked from e6b969f3b in master. Do not merge. * commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec': Cherry-picked from e6b969f3b in master. Do not merge.