commit | 6d1b47b505bcace0890fd359c57283420495c3ff | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 08:18:06 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 08:18:06 2010 -0700 |
tree | 84c1b4d7f1c85b0a30e694a3bc9adee8ef7367b1 | |
parent | 6f5096b1885459bc0818c7634ba33c03e455dc7b [diff] | |
parent | c491fdc6f5436245783c1a61cf0dee8ca0b8277d [diff] |
am c491fdc6: am 6be163b1: merge from open-source master