| commit | ccfbd1bacc3c0ab5525b2cfd695ad225468a338e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 10 17:37:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 17:37:02 2014 +0000 |
| tree | 9291ee72aa494526432c8c5dbb4cb133cc5dff87 | |
| parent | f805988770761e2446436d4e5fac58b3e95faac5 [diff] | |
| parent | 20083734d92eb893c36278d2486404eedc0cc1f9 [diff] |
am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '20083734d92eb893c36278d2486404eedc0cc1f9': Import translations. DO NOT MERGE