summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Skory <skory@google.com>2014-03-20 02:46:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 02:46:56 +0000
commit5cc929caa0922e0b80dbf3f6c099d841c3797c20 (patch)
tree9b9d16dfaded74da356597889544b8575cea3307
parent2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c (diff)
parentb346133679f409e3f4e7389c5dced451b9980a57 (diff)
downloadandroid_packages_apps_Trebuchet-5cc929caa0922e0b80dbf3f6c099d841c3797c20.tar.gz
android_packages_apps_Trebuchet-5cc929caa0922e0b80dbf3f6c099d841c3797c20.tar.bz2
android_packages_apps_Trebuchet-5cc929caa0922e0b80dbf3f6c099d841c3797c20.zip
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit 'b346133679f409e3f4e7389c5dced451b9980a57':
0 files changed, 0 insertions, 0 deletions