diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-05-06 01:27:30 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-06 01:27:30 -0700 |
commit | 2e74b159f517fccb402a75045af821702f2310af (patch) | |
tree | dc8940cdf38bae09e3427e44ebf1328861abc20b | |
parent | 7a1355950172b7a549820e9a2cd4a9b2099ec32f (diff) | |
parent | dccc39b17ab85ad5b970dc299d95c0b53b4e7f25 (diff) | |
download | frameworks_base-2e74b159f517fccb402a75045af821702f2310af.zip frameworks_base-2e74b159f517fccb402a75045af821702f2310af.tar.gz frameworks_base-2e74b159f517fccb402a75045af821702f2310af.tar.bz2 |
merge dccc39b to make automerger happy, original change 231cc6 was already merged
Merge commit 'dccc39b'
0 files changed, 0 insertions, 0 deletions