diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 09:06:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 09:06:52 -0700 |
| commit | 0c316eeb437a0ac1d6840690be643d1a553f0b23 (patch) | |
| tree | 1332be4e75217d0cee1e43875ef0977cd9234604 /core/java/android/provider | |
| parent | fe762e9d127988b736422915ee8bac3d9321a786 (diff) | |
| parent | ddbcce3afbb38680fb84583f7bad5209307e6459 (diff) | |
| download | frameworks_base-0c316eeb437a0ac1d6840690be643d1a553f0b23.zip frameworks_base-0c316eeb437a0ac1d6840690be643d1a553f0b23.tar.gz frameworks_base-0c316eeb437a0ac1d6840690be643d1a553f0b23.tar.bz2 | |
am ddbcce3a: Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit 'ddbcce3afbb38680fb84583f7bad5209307e6459'
* commit 'ddbcce3afbb38680fb84583f7bad5209307e6459':
Keep track of remaining fd when devices are removed
Diffstat (limited to 'core/java/android/provider')
0 files changed, 0 insertions, 0 deletions