| commit | 4d6e75cbfdb669f72889ea31bdc299cb3ce7f100 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:51:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:51:59 2015 +0000 |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d | |
| parent | cd3b1d77c5ed8071ee3e6638208f1065578076dc [diff] | |
| parent | 22a0c0e3dc4198acab5828687a306d291288ad25 [diff] |
am 22a0c0e3: (-s ours) am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '22a0c0e3dc4198acab5828687a306d291288ad25': Import translations. DO NOT MERGE