commit | 3f0545a7dcba1fbd9951e06009df8054a278051d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jan 07 15:39:30 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 07 15:39:30 2015 +0000 |
tree | 38c2074c571b1d246a2989bd02ae2835b1e533a3 | |
parent | 719d5b3df01826de8e5b309303908e775e5164c4 [diff] | |
parent | 4e46775ceb609220169ec8ff9c6a1310d3fd7c34 [diff] |
am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE automerge: 4e46775 -s ours * commit '4e46775ceb609220169ec8ff9c6a1310d3fd7c34': Import translations. DO NOT MERGE