commit | f080d8648251a72ca9f9e713f5cfef9ec3323785 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:43:26 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:43:26 2015 +0000 |
tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 | |
parent | 856a9f99d514c6adf55c9ecedde866582a03a84a [diff] | |
parent | f8434712def33aef77067a18845509f7ee8394ee [diff] |
am f8434712: (-s ours) am 0367b1c1: (-s ours) am ec10f595: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'f8434712def33aef77067a18845509f7ee8394ee': Import translations. DO NOT MERGE