summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-17 12:59:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-17 12:59:38 -0700
commit3736062244b9393c62a4a74cbb07bc4d8a103aed (patch)
tree68a871428d73b28421de0a41ef6440b211c40499
parent040c13b3a5d02edf3b2d1a8a0791145f7130ae9f (diff)
parente29b9ae47bc21bb582dd6a0fb57796c09d3c8722 (diff)
downloadandroid_packages_apps_Trebuchet-3736062244b9393c62a4a74cbb07bc4d8a103aed.tar.gz
android_packages_apps_Trebuchet-3736062244b9393c62a4a74cbb07bc4d8a103aed.tar.bz2
android_packages_apps_Trebuchet-3736062244b9393c62a4a74cbb07bc4d8a103aed.zip
am e29b9ae4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e29b9ae47bc21bb582dd6a0fb57796c09d3c8722':
0 files changed, 0 insertions, 0 deletions