commit | c1038e778ff9f1efe6334ca71b74df5f720e6970 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 16:37:22 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 16:37:22 2010 -0700 |
tree | 487c97fa19467613b9c6b58d2dd3b4f971469398 | |
parent | 7ad843d66d3ebb9250f00e836f0e8e9502d7287b [diff] | |
parent | 6af5a9ea4d7efb16c859467389c9e3cb9352eaa6 [diff] |
merge from open-source master Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b