commit | 386f70a2b0be98122fe4afea35876a737bebb713 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:47:12 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:47:12 2010 -0700 |
tree | 8441cd36527966facf62a90555fa31fc5afd8591 | |
parent | 7ec45cb4635c72d33c5b38fdc283c40adbd3db17 [diff] | |
parent | ce88086cc425b33e0c389dc9a233e5a72acf6833 [diff] |
am ce88086c: am 105a934f: am 9514fca5: merge from open-source master