tree 88de604ede5363e31fcf2f09225ff08bdf2e401e
parent 4e1c4486db65ade0892fb0a080260a6e24876a8c
parent a3271b08a4aa88050e58ebac5feb734bdf011b09
author Geoff Mendal <mendal@google.com> 1424997848 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424997849 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master