| commit | edfdeeee309c19c553f5a5661d4070b5132995cf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 14:38:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 14:38:55 2015 +0000 |
| tree | 7c393e532652b1cf4d5372e9073dbea6fb38c01c | |
| parent | 1c95645b3bbc55db50d5720e29a2b867d849d0f8 [diff] | |
| parent | b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a [diff] |
am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours * commit 'b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a': Import translations. DO NOT MERGE