summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-27 14:52:53 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-27 14:52:54 -0700
commit115b146cc2dc4b4f9d43b4cd761727d233fc297c (patch)
treefc6ad753a7beab94b4a01a2f14a1754cb814c18d
parent8e1b4f65383d859ca7e2ebfc9a9463c8d46271de (diff)
parent46f961baabcfb3bd73ed5b4cf2ec7cf8e642ab1c (diff)
parent1f1d755ada0bc7d33c8c7226fe730d05d6a53acc (diff)
downloadandroid_packages_apps_Trebuchet-115b146cc2dc4b4f9d43b4cd761727d233fc297c.tar.gz
android_packages_apps_Trebuchet-115b146cc2dc4b4f9d43b4cd761727d233fc297c.tar.bz2
android_packages_apps_Trebuchet-115b146cc2dc4b4f9d43b4cd761727d233fc297c.zip
Reconcile with jb-mr0-release jb-release
Change-Id: I3742aff353335629ae76eacc2d92a6aed87b1ebe