tree c028bfe537607823c37e2ffc8c713c73059d3130
parent b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b
parent bfe43479643fece25c8aeabb64b90ca9d6c028be
author Baligh Uddin <baligh@google.com> 1445302438 +0000
committer android-build-merger <android-build-merger@google.com> 1445302438 +0000

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19  -s ours
am: bfe4347964  -s ours

* commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':