| commit | 660265b3fc41489c0cb67d5474651dcfcc1b3938 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 28 22:48:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 22:48:24 2015 +0000 |
| tree | 7f7537a8a14b7e5a6bb6f910234d2dd5e6e0a8c1 | |
| parent | bc7798b550abf35027c8221a56b330dbf16e3ecc [diff] | |
| parent | 9fd976e427c1c6d7242bb84787c01009e3261fdc [diff] |
am 9fd976e4: (-s ours) Import translations. DO NOT MERGE * commit '9fd976e427c1c6d7242bb84787c01009e3261fdc': Import translations. DO NOT MERGE