summaryrefslogtreecommitdiff
path: root/libs/utils/String16.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2010-05-10 13:50:32 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-10 13:50:32 -0700
commite45269d85230442ff7b287cdee706e6138cbebcb (patch)
treeb013fbb9d1d2f493488ba7f3fcebca98f88110c1 /libs/utils/String16.cpp
parent914b12a965de255f4a496f39f7f9366a408b7c2f (diff)
parent22cffae52d7f2c04b54d47503f8bfea5dca92535 (diff)
am b6f0cbdc: merge from open-source master
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken * commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1': Include the API level 4 fields in the Parcel.
Diffstat (limited to 'libs/utils/String16.cpp')
0 files changed, 0 insertions, 0 deletions