summaryrefslogtreecommitdiffstats
path: root/protos
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-07-16 01:10:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-16 01:10:17 +0000
commitc606871502e9c6e69c00e3f79d2c2871d7a26dec (patch)
treef24bd28670b25a6d3be0fe66013f7d009c2cf0ac /protos
parentbe217bf044892d49e427f000606308860a755585 (diff)
parent3fec14bedc03d77aa7a066a8053c6068dddda192 (diff)
downloadandroid_packages_apps_Trebuchet-c606871502e9c6e69c00e3f79d2c2871d7a26dec.tar.gz
android_packages_apps_Trebuchet-c606871502e9c6e69c00e3f79d2c2871d7a26dec.tar.bz2
android_packages_apps_Trebuchet-c606871502e9c6e69c00e3f79d2c2871d7a26dec.zip
am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte
* commit '3fec14bedc03d77aa7a066a8053c6068dddda192': [DO NOT MERGE] fixing build break
Diffstat (limited to 'protos')
0 files changed, 0 insertions, 0 deletions