summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2014-03-20 02:46:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 02:46:57 +0000
commitd5da3cc1d8e534f60925514bbc7d1e72b225cd97 (patch)
tree9b9d16dfaded74da356597889544b8575cea3307
parent524ed6addab4294f3be29cfbef5ef571077ca3a4 (diff)
parent48e725bdf4c92d3faf82c1788b56aa0491b566be (diff)
downloadandroid_packages_apps_Trebuchet-d5da3cc1d8e534f60925514bbc7d1e72b225cd97.tar.gz
android_packages_apps_Trebuchet-d5da3cc1d8e534f60925514bbc7d1e72b225cd97.tar.bz2
android_packages_apps_Trebuchet-d5da3cc1d8e534f60925514bbc7d1e72b225cd97.zip
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit '48e725bdf4c92d3faf82c1788b56aa0491b566be':
0 files changed, 0 insertions, 0 deletions