tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 264c67da938a2da4ca2195ed498de75cd170be4b
parent e7a344a5bd6f2c04f39683849d905c88676e25b0
author Baligh Uddin <baligh@google.com> 1445310351 +0000
committer android-build-merger <android-build-merger@google.com> 1445310351 +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
am: e7a344a5bd  -s ours

* commit 'e7a344a5bd6f2c04f39683849d905c88676e25b0':