commit | deb7a12ae53ffc6256304c8b614272992c8c7777 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 28 13:05:20 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 28 13:05:20 2010 -0700 |
tree | 6e7e3efbbc9dc33501fc2ccd994ff7aaae73297f | |
parent | db3fd7f60898f19f55aa9450d7d9cb3baf4386de [diff] | |
parent | 7e113e396d50868e5c2f3ee6c94da20a2cb64813 [diff] |
am 7e113e39: am 9a22c68e: merge from open-source master