commit | 439a015baa65c68ff52c7ac92dd522488c16f0d1 | [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 | a05927daa315c5338b5424e1916c5a98272f9a13 | |
parent | 44d258d5be10ff68e0eae700b6439ec4b94f5a31 [diff] | |
parent | 730126bf5a087bd9bc9e84b79a35433cd466d992 [diff] |
am 730126bf: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread * commit '730126bf5a087bd9bc9e84b79a35433cd466d992': DO NOT MERGE - backport of l92a02b31 from master