commit | d8073cce0a8e78515796df3080a8c7d14c2c415b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 01 16:21:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 16:21:03 2015 +0000 |
tree | 73901e71a3ddfcf186e51b16c22d160c13f46f57 | |
parent | 6d3a13884d2c91f26532264664b7f4fa0bcd68b8 [diff] | |
parent | e57850149166aac5390cb50cabfc01f41ddc2ef1 [diff] |
am 4f18c7e0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '4f18c7e0c08da7351bc8aeca7a47f20d2bf8187c': Import translations. DO NOT MERGE