commit | 32df01f7750b265d78369d34df90e79d21a76504 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 15 11:37:17 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 15 11:37:17 2010 -0700 |
tree | db09ecd886d4c41aab785f04ba7350d9b1ca19df | |
parent | 0acbc14307d69dccf7749fff9239d224523799a4 [diff] | |
parent | f4729d230c030926302da244f67b9ebe9a8ce9b0 [diff] |
merge from open-source master Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3