| commit | 4eb1f0d9022ae570a71eeedacb72a8d839340ec1 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Sep 03 16:51:32 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 03 16:51:32 2010 -0700 |
| tree | a4bada47348a04c460476565910cdb25279388fa | |
| parent | bfcb1f5c4e53c76d363d230b3cad7ea971a90301 [diff] | |
| parent | acc4e041d27c24b45fb190c493717fda987b52c2 [diff] |
am acc4e041: (-s ours) am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready. Merge commit 'acc4e041d27c24b45fb190c493717fda987b52c2' * commit 'acc4e041d27c24b45fb190c493717fda987b52c2': DO NOT MERGE. Some stuff that is Not Ready.