tree ab196733c5bd698dde945adbba9a98f12f32999f
parent e1301a542444cf9fac0e4aa57726865a6311e80b
parent fcd04c6b3cddbc730de8c648a0afb8704e43e112
author Baligh Uddin <baligh@google.com> 1396621380 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396621381 +0000

Merge "Import translations. DO NOT MERGE"