commit | 6462184e288685d63aedac142ac84bd1c82b1af3 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 03 23:16:29 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 03 23:16:29 2014 +0000 |
tree | 308bfe160bdd2b8f1774e6606c2f4a2d2a9732cd | |
parent | 8e5ccfb48dbc4e9ae806f4eb54781ab2ea74d923 [diff] | |
parent | 8eada9d964cf20993615a48ec50ff364050bb2e9 [diff] |
am c4127f91: (-s ours) am 46fadb5f: (-s ours) Import translations. DO NOT MERGE automerge: 8eada9d -s ours * commit '8eada9d964cf20993615a48ec50ff364050bb2e9': Import translations. DO NOT MERGE