commit | 3211f226a1de83a7cbf52017eb26b22ae0eb4bdb | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 15:28:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 15:28:55 2014 +0000 |
tree | 80678beff7ceb8072d9bb74d91fff0c04e427194 | |
parent | 27bca9ba461fee0dc83a70803584881802e560e7 [diff] | |
parent | 460bf98463a34905eb1a00b9c986647a573bb89d [diff] |
am 44e6948c: (-s ours) am 6eef366a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '44e6948c9221ef0ff76c8f561d1514f015d43a9b': Import translations. DO NOT MERGE