commit | e8284f31e752bd45152efab281ab695915437563 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:35:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:35:05 2015 +0000 |
tree | e62d44b05a77d2a0b5d6f8a1c98211f9d773897b | |
parent | 9710294d14b6e6071d650a33929d230286be8ff0 [diff] | |
parent | a2360b830146afa7c649df603b25429f6feda669 [diff] |
am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'a2360b830146afa7c649df603b25429f6feda669': Import translations. DO NOT MERGE