tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent 54d17dff6db6847b33bf07e1af6fbaa2e3bbe19d
parent 3eaeafbebf191a5ea5c98592f2042424b3610fbd
author Baligh Uddin <baligh@google.com> 1445307781 +0000
committer android-build-merger <android-build-merger@google.com> 1445307781 +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

* commit '3eaeafbebf191a5ea5c98592f2042424b3610fbd':