diff options
| author | Cary Clark <cary@android.com> | 2009-11-06 11:29:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-06 11:29:40 -0800 |
| commit | ca3a6dc41418da152d154245c59054f7d0f0d679 (patch) | |
| tree | 6fdaaba4b697236bfe76d78cc3c5e069cbb25250 /core/java/android/os | |
| parent | f28e0c2ac75bf630a595d442a7ddefcc1f8386f6 (diff) | |
| parent | 45011f2dc56e99c00bd1f3abff4f11d6df644d80 (diff) | |
| download | frameworks_base-ca3a6dc41418da152d154245c59054f7d0f0d679.zip frameworks_base-ca3a6dc41418da152d154245c59054f7d0f0d679.tar.gz frameworks_base-ca3a6dc41418da152d154245c59054f7d0f0d679.tar.bz2 | |
am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2
* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
do not merge -- original checkin to mr2 here:
Diffstat (limited to 'core/java/android/os')
0 files changed, 0 insertions, 0 deletions