| commit | 860728a3f0c7a0346465d0dcf64127fa87d1490c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 03 16:19:05 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 03 16:19:05 2010 -0700 |
| tree | 4cf013daa72d160c2277eafa6e18c3dc4df135ef | |
| parent | 632320c9dfb28aa3d7bc0ec66b99fb0e4eebab18 [diff] | |
| parent | e5ab92a292a8e9e5ee0ee3e12c7d59903ee5ff31 [diff] |
am e5ab92a2: am cf6ab741: merge from open-source master