summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Danica Chang <danicachang@google.com> 2010-07-19 13:52:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-19 13:52:38 -0700
commitcab94f75aadb9fc3c7b592919765897b7741c63f (patch)
tree18ea83a815dafb0830e8e682197842d5ae9292d5 /libs/hwui/Program.cpp
parent4a1d035b935abea0a046e6e243520ff367445327 (diff)
parentcbbd3a1b950ef14075159319ac0fd0a8a19bb9ed (diff)
am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed' * commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed': fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions