| commit | d54db430276ab047041c5e7d0d866e2eb357e54d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:24:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:24:14 2015 +0000 |
| tree | 838af24d7bfdb4a914af81d8e478284e830ce023 | |
| parent | b2505248385e164cd8d5de42a3c27fca27487397 [diff] | |
| parent | 08190abd4aa983b6c7e61e0ba722a45b489199c0 [diff] |
am 08190abd: (-s ours) am a07becf6: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '08190abd4aa983b6c7e61e0ba722a45b489199c0': Import translations. DO NOT MERGE