tree b4fcaa6b1089e8729b927738ff26afc6edc38769
parent 7f6067d8624f89594b8ab635871cd78fba998eaf
parent 3e1da162043c037c9e3b670de999544d64c34bc7
author Geoff Mendal <mendal@google.com> 1415852875 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415852876 +0000

Merge "Import translations. DO NOT MERGE"