summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-05-12 07:50:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:50:14 -0700
commitbbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b (patch)
tree56d7df775385e3994fd9d8c89c494b2fbda4e807 /api
parentb6e1ec19dd73cb55baef538a9119bcac0f8b9366 (diff)
parent836b2d75ef86487ecae0ae834ecbab324fd99471 (diff)
downloadframeworks_base-bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b.zip
frameworks_base-bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b.tar.gz
frameworks_base-bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b.tar.bz2
am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp * commit '836b2d75ef86487ecae0ae834ecbab324fd99471': Don't clear the _data column in the audio_meta table, since it isn't
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions