| commit | d1a615e9a2ab2cd18277064091c243b9b7e61d82 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:26 2015 +0000 |
| tree | edb91ce7e7c9dc6d33389277e2e2adcac1d36854 | |
| parent | 0d619da9332cc2ca440ae3dd22b43335a6b5d358 [diff] | |
| parent | dbba221709b04925c3e84ccfaef4fee01684f065 [diff] |
am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'dbba221709b04925c3e84ccfaef4fee01684f065':