diff options
| author | 2011-07-14 10:55:55 -0700 | |
|---|---|---|
| committer | 2011-07-14 10:55:55 -0700 | |
| commit | 1ecf9d3e2861749f7cb1607aceecc5a016418099 (patch) | |
| tree | 0b2d34383e7b75619af9fe76d5a4b0084b3fc46a /libs/ui/FramebufferNativeWindow.cpp | |
| parent | b62a5356ff603cd146301b099b1a1c4b8a3f7f09 (diff) | |
| parent | a4994b2c1d68c62c328a47d49607249dcb6ac22e (diff) | |
am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
Bluetooth: correcting return value from cancelDiscovery
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions