| commit | 762b636a6ab0c44f6e3c6bad0a96bd7fd03e5459 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Jan 09 19:43:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 09 19:43:40 2015 +0000 |
| tree | 17d1b5093610ca9326ffb8c9ecfb90f2c37a2b83 | |
| parent | e05252785eadac7fec0aa863a91e2a3d24dff87f [diff] | |
| parent | 895d5c5b24c2cc4fb21dad073acf8af605b7d2cd [diff] |
am 895d5c5b: (-s ours) am 304e2776: (-s ours) am afe5f1ba: (-s ours) Merge "Import translations. DO NOT MERGE. update Mac aapt. lmp-mr1-release build id 1672261." into lmp-mr1-dev * commit '895d5c5b24c2cc4fb21dad073acf8af605b7d2cd': Import translations. DO NOT MERGE. update Mac aapt. lmp-mr1-release build id 1672261.