commit | 22cffae52d7f2c04b54d47503f8bfea5dca92535 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 10 13:48:37 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon May 10 13:48:37 2010 -0700 |
tree | 476ae738583482b7fe7952f52a73c228a2824d1f | |
parent | 03ba157ee34b92153e201af5f8640aae868822d2 [diff] | |
parent | 3658de5fdd3d2f71dc4b6c298261472348bb3ce0 [diff] |
merge from open-source master Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c