| commit | 4e46775ceb609220169ec8ff9c6a1310d3fd7c34 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 07 15:37:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 15:37:27 2015 +0000 |
| tree | 647cdbf0270523a8fd9bcb04bdb5db786d676aff | |
| parent | 23bb3f11cbe4ca64337b5b75c333ea891760213f [diff] | |
| parent | d79d0310b1eb6e250b3009653ac0490f35fd95bd [diff] |
am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE * commit 'd79d0310b1eb6e250b3009653ac0490f35fd95bd': Import translations. DO NOT MERGE