summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-06-24 09:31:45 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-24 09:31:45 -0700
commitd629abd0976915be4aa4618d1617aa9df8fe27d2 (patch)
tree5b253abd3b40b66a9239509b8839d3072a94163f /libs/rs/rsObjectBase.cpp
parent15149f2ef8609899f187b691054194ec50b9a0ee (diff)
parent5da347dd2dc7de8828077057f4963b904018c5ec (diff)
am 5da347dd: (-s ours) am 477def1d: Merge changes I11495d03,If5816721 into gingerbread
Merge commit '5da347dd2dc7de8828077057f4963b904018c5ec' * commit '5da347dd2dc7de8828077057f4963b904018c5ec': Add a new UEventObserver subclass to broadcast an Intent whe USB state changes. DO NOT MERGE Add new permission to allow access to USB devices
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions