commit | a22b16af41ecc47979f3cc06226bef54fd0e4f74 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 23:31:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 23:31:30 2015 +0000 |
tree | 83d315414916123ca1f22e16026690af746c48d9 | |
parent | 2d65e85e38fc04d934ed329e988af52e2878022a [diff] | |
parent | 22b1759166a2b3715c78b6e584e3de226c9ca39a [diff] |
am b5f91618: (-s ours) am e82dcd32: (-s ours) am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'b5f916187a54fc8c462344bf966391048745ebc2': Import translations. DO NOT MERGE