commit | 22b1759166a2b3715c78b6e584e3de226c9ca39a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:22 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:22 2015 +0000 |
tree | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
parent | d8d8363d4ebcf7f744ef26b4b8a396c0461c16b0 [diff] | |
parent | 5b92b90b549af5a5b1592893539a9d64c1419af1 [diff] |
am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '80e9c04e910f88283f34dddac36f32db291e9c63': Import translations. DO NOT MERGE