tree fd1ba7150071cb166993da1decdd3f80549c7907
parent bffce8ce7a4a4c8625d5443093e2c1caaabaf975
parent af6b00a8a0f1ccab15eda19b46bc2e31d5c70543
author Baligh Uddin <baligh@google.com> 1445310016 +0000
committer android-build-merger <android-build-merger@google.com> 1445310016 +0000

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19  -s ours am: bfe4347964  -s ours am: 669ef65afb  -s ours am: 03937ac5d7  -s ours am: 909bcceeb4  -s ours am: 522d4ac6fe  -s ours am: 3eaeafbebf  -s ours
am: af6b00a8a0  -s ours

* commit 'af6b00a8a0f1ccab15eda19b46bc2e31d5c70543':