| commit | c609f4db3f08ef14db1612ac50af5e4e8aa1c580 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 19:13:52 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 30 19:13:52 2014 +0000 |
| tree | d04290afc56aa37b3af2fafaa7482bf72043f2a4 | |
| parent | fa61bfa429edacc2bacf0f9e427e39359d02dfec [diff] | |
| parent | ef3d9bc8ac5208d8a8e30ae0a7e60a0dc461d2c4 [diff] |
am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: ef3d9bc -s ours * commit 'ef3d9bc8ac5208d8a8e30ae0a7e60a0dc461d2c4': Import translations. DO NOT MERGE