summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-21 09:02:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-21 09:02:35 -0700
commita705456a62bf93456cc71425a39e1003022e109a (patch)
tree25889df9d9a512dbe7d571999d8a1b9379cad4be
parenta1e7617e7e6ad6426ef4d7f042346e7af8b818e9 (diff)
parent9be6ae7264fd203f353a37604a50a963e5814143 (diff)
downloadandroid_packages_apps_Trebuchet-a705456a62bf93456cc71425a39e1003022e109a.tar.gz
android_packages_apps_Trebuchet-a705456a62bf93456cc71425a39e1003022e109a.tar.bz2
android_packages_apps_Trebuchet-a705456a62bf93456cc71425a39e1003022e109a.zip
am 9be6ae72: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '9be6ae7264fd203f353a37604a50a963e5814143':
0 files changed, 0 insertions, 0 deletions