| commit | ebe88546a7ef8f8a116f14b43c81759eda68357d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 11:53:59 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 11:53:59 2010 -0700 |
| tree | 60daf2d2919e8f3e371d0125f62512c0e60094f7 | |
| parent | 70a153b61fc7606e6bb4dd279013ba87804b86e6 [diff] | |
| parent | 55e849a5904425a1a54887bbd2d08b0fc52a68d1 [diff] |
am 55e849a5: merge from open-source master