commit | 6adea48d1ddb91ee613d4a1394f56535fe0a70e7 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:13:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:13:55 2014 +0000 |
tree | 1334856479a7668f324d567e998d014d2b71096e | |
parent | 485cc2ff66be2b337ebebc307a00f4b000f9d663 [diff] | |
parent | 8900e55113eff52f593407f2f02a3f4744f10c91 [diff] |
am 8900e551: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '8900e55113eff52f593407f2f02a3f4744f10c91': Import translations. DO NOT MERGE