summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:48:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-16 05:48:23 -0700
commit040c13b3a5d02edf3b2d1a8a0791145f7130ae9f (patch)
tree68a871428d73b28421de0a41ef6440b211c40499
parentf86243115aae7afa7b6c0464adf6cc8bd39dc5d2 (diff)
parent9ad2c67ab0da915134dc6020f57cce8f7cb30c70 (diff)
downloadandroid_packages_apps_Trebuchet-040c13b3a5d02edf3b2d1a8a0791145f7130ae9f.tar.gz
android_packages_apps_Trebuchet-040c13b3a5d02edf3b2d1a8a0791145f7130ae9f.tar.bz2
android_packages_apps_Trebuchet-040c13b3a5d02edf3b2d1a8a0791145f7130ae9f.zip
am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '9ad2c67ab0da915134dc6020f57cce8f7cb30c70':
0 files changed, 0 insertions, 0 deletions