| commit | 1c5d3df88483040b90601d0374729607f9b52629 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 12 12:59:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 12:59:16 2015 +0000 |
| tree | d520e4613704975e6efd7ec595d4f7980f61830c | |
| parent | 3561f7d327e7e066fa9e13c96365d0b44010ef5f [diff] | |
| parent | 5e847c133d959ed426d11c559cc7952274a27d42 [diff] |
am 48a1ffaa: (-s ours) am 6fb8c107: (-s ours) Import translations. DO NOT MERGE * commit '48a1ffaa5dc103d211bd26f9b3c9f00db0996f04': Import translations. DO NOT MERGE