summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-05-13 16:03:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-13 16:03:36 -0700
commit8156369570c0fba75c5541d40fb06f85b70b33b1 (patch)
tree537fb76a51d7be08e730837ea581d9db40ac5ee9
parent3c879634167bf91fa370c19983f9b4853837c3ce (diff)
parent328acffd8b2ba73693da76ce85581661db45c5aa (diff)
downloadandroid_packages_apps_Trebuchet-8156369570c0fba75c5541d40fb06f85b70b33b1.tar.gz
android_packages_apps_Trebuchet-8156369570c0fba75c5541d40fb06f85b70b33b1.tar.bz2
android_packages_apps_Trebuchet-8156369570c0fba75c5541d40fb06f85b70b33b1.zip
am 328acffd: (-s ours) am 2e8ba1c1: am 8ff6cb60: DO NOT MERGE
* commit '328acffd8b2ba73693da76ce85581661db45c5aa': DO NOT MERGE
0 files changed, 0 insertions, 0 deletions