tree c028bfe537607823c37e2ffc8c713c73059d3130
parent ce0117dc598f24e97b929df5567329e4816a777d
parent 6317598a196ada3f32950c7f4a8d5cfe005acf42
author Baligh Uddin <baligh@google.com> 1445300880 +0000
committer android-build-merger <android-build-merger@google.com> 1445300880 +0000

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

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':