commit | 7b3a79c9e00203277e8a26eebbee21443cf92f54 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon May 11 13:40:11 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 11 13:40:11 2015 +0000 |
tree | 0dd59ba884308f808ef4b74a20b0bfa89cecf55c | |
parent | 1905d8f34ee317da788244f2dde3e8b75c25c072 [diff] | |
parent | 31fca99b4a4005895184e733cb96d40c430fc877 [diff] |
am 31fca99b: (-s ours) am 81c93829: (-s ours) Import translations. DO NOT MERGE * commit '31fca99b4a4005895184e733cb96d40c430fc877': Import translations. DO NOT MERGE