summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-31 14:51:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-31 14:51:10 -0700
commit8a7d620aa0ad7bada6f50b757d1bc328db1fe257 (patch)
treebebef3e8b8d9ef0842d6591508d78f58300dd5bb /MODULE_LICENSE_APACHE2
parent0bcb5d904455c930bd2d7b68a477da2fe43dbcea (diff)
parent4124016ae5c8174aa53433894b896604ffa52c67 (diff)
downloadandroid_packages_apps_Trebuchet-8a7d620aa0ad7bada6f50b757d1bc328db1fe257.tar.gz
android_packages_apps_Trebuchet-8a7d620aa0ad7bada6f50b757d1bc328db1fe257.tar.bz2
android_packages_apps_Trebuchet-8a7d620aa0ad7bada6f50b757d1bc328db1fe257.zip
am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '4124016ae5c8174aa53433894b896604ffa52c67':
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions