summaryrefslogtreecommitdiffstats
path: root/core/jni/android_server_BluetoothService.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-05-23 16:43:57 -0700
committerXavier Ducrohet <xav@android.com>2011-05-23 17:51:22 -0700
commitc7b87766b21fe5cf2f644efa8753b936d413dc9a (patch)
tree4655c3dcd0de4b9466d4e7e3eb77c12d1deb422e /core/jni/android_server_BluetoothService.cpp
parent4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7 (diff)
downloadframeworks_base-c7b87766b21fe5cf2f644efa8753b936d413dc9a.zip
frameworks_base-c7b87766b21fe5cf2f644efa8753b936d413dc9a.tar.gz
frameworks_base-c7b87766b21fe5cf2f644efa8753b936d413dc9a.tar.bz2
Merge 2402ad60 from honeycomb-mr1. do not merge.
LayoutLib: Fix Canvas_Delegate.native_concat(). Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
Diffstat (limited to 'core/jni/android_server_BluetoothService.cpp')
0 files changed, 0 insertions, 0 deletions