commit | 703f4958c207c575adfa1526725728b96c575649 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 09 14:54:44 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 09 14:54:44 2010 -0700 |
tree | 78ff6ce3ba358af9852d876235577d076bd1e41b | |
parent | d7fcea201db376e285aab74cefae29d2ac2b33df [diff] | |
parent | 68f9303c90253f5149e4bfe323f9ee77fdf4b380 [diff] |
merge from open-source master Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf