| commit | ccc8c287ad87ce6b2a35aec40f5009291a300b25 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 03 05:35:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 03 05:35:32 2015 +0000 |
| tree | da3ef725bdaab19c0d58ec6af4f28d34ebd295bc | |
| parent | 3363c008042e9e9e9944f1a9cff2d0540def16e8 [diff] | |
| parent | d8073cce0a8e78515796df3080a8c7d14c2c415b [diff] |
am d3d0e9be: (-s ours) am 3f2b61c0: (-s ours) am 4f18c7e0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'd3d0e9bea4b9602382fe96bec47f729ba1ab5281': Import translations. DO NOT MERGE