summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/ContactsContract.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-11 22:04:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-11 22:04:27 -0700
commit9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e (patch)
tree2c8e4ee7154493cec0db4a1e62a4e3b6c1a20cd2 /core/java/android/provider/ContactsContract.java
parent70a7c92e161225f587af453e01d2b124dbf6303f (diff)
parentfb86ce93079db4465a61489275c65bcf8ce4669e (diff)
downloadframeworks_base-9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e.zip
frameworks_base-9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e.tar.gz
frameworks_base-9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e.tar.bz2
am fb86ce93: Add watermark support.
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp * commit 'fb86ce93079db4465a61489275c65bcf8ce4669e': Add watermark support.
Diffstat (limited to 'core/java/android/provider/ContactsContract.java')
0 files changed, 0 insertions, 0 deletions