diff options
| author | Eric Laurent <elaurent@google.com> | 2009-10-28 10:26:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 10:26:33 -0700 |
| commit | 34180d328c57a6a38bc85651fda0e69890ad7a9b (patch) | |
| tree | 5bd7d26be381153f31e9792c65151c303de26d2d /services | |
| parent | 76a5429407e821c22508eca92e7475b6433cd668 (diff) | |
| parent | a47d153647d8750b667942ad80e7b905ea98c68b (diff) | |
| download | frameworks_base-34180d328c57a6a38bc85651fda0e69890ad7a9b.zip frameworks_base-34180d328c57a6a38bc85651fda0e69890ad7a9b.tar.gz frameworks_base-34180d328c57a6a38bc85651fda0e69890ad7a9b.tar.bz2 | |
am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions