commit | f56e9165d9ba2984dc2534c9c19bc33b48f17cab | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 08 13:14:16 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 08 13:14:30 2010 -0700 |
tree | 2a35f8e01dc5adc66bb622971fcd7d01e892672c | |
parent | 4873d8f5ca9fecc9c826ad383befbefb3407296b [diff] | |
parent | 64947314b74cc280928628614a4434c0b5c5dfb6 [diff] |
merge from open-source master Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa