summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-04-03 18:05:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 18:05:29 -0700
commit33aa662ddbe474beaa47dca4ecd02a1d3873514a (patch)
tree85f2369be584c47eb3277a117750fa4a3c5dd04a
parent0191be1d6795340cc20dc0388d80b4df1302a773 (diff)
parentf1bfab47b89c8fab7811339c02848ee5a10ec335 (diff)
downloadandroid_packages_apps_Trebuchet-33aa662ddbe474beaa47dca4ecd02a1d3873514a.tar.gz
android_packages_apps_Trebuchet-33aa662ddbe474beaa47dca4ecd02a1d3873514a.tar.bz2
android_packages_apps_Trebuchet-33aa662ddbe474beaa47dca4ecd02a1d3873514a.zip
am f1bfab47: Reconcile with jb-mr2-release - do not merge
* commit 'f1bfab47b89c8fab7811339c02848ee5a10ec335':
0 files changed, 0 insertions, 0 deletions