summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2009-10-29 10:18:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 10:18:17 -0700
commite7ab7448be1da2701e6c1ff12e9845dce4860940 (patch)
tree05f9545850c095384cf9506b05df9751cf6df7eb
parent590dfffe1ab99a9e7889aa7729c1a4cb7b2274ec (diff)
parent1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b (diff)
downloadframeworks_base-e7ab7448be1da2701e6c1ff12e9845dce4860940.zip
frameworks_base-e7ab7448be1da2701e6c1ff12e9845dce4860940.tar.gz
frameworks_base-e7ab7448be1da2701e6c1ff12e9845dce4860940.tar.bz2
am 1f7253c3: (-s ours) am 5de6389f: DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Merge commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b' * commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b': DO NOT MERGE. Send a message when the picture changes and find is up to search again.
0 files changed, 0 insertions, 0 deletions