commit | 271397cfb2b79d1346568209b37b1f57707f924a | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Wed Feb 16 10:55:54 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 16 10:55:54 2011 -0800 |
tree | b3560b6300d3ef9e83c638aa6d7bd095dd6b3686 | |
parent | aebe3dfe61ba889962174cf9e24783770af31e02 [diff] | |
parent | de27b519588ed46c0ba601a489c01d26ec31757d [diff] |
am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread * commit 'de27b519588ed46c0ba601a489c01d26ec31757d': DO NOT MERGE - backport of l92a02b31 from master