| commit | 36c037dcaaa8d5c121578b9ea25e0dde70eb7b68 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Oct 14 19:58:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 19:58:28 2014 +0000 |
| tree | 471472ce9c335fafb78eb3048bcfccf9040cbeee | |
| parent | 6116e608d9dfeaea1e016cfa067509e98198fb82 [diff] | |
| parent | 7e935e5060c147f67897389f800762d342965c3d [diff] |
am 7e935e50: (-s ours) am 648151ab: (-s ours) Merge "Import translations. DO NOT MERGE - Update prebuilt SDK to LRX14" into lmp-dev * commit '7e935e5060c147f67897389f800762d342965c3d': Import translations. DO NOT MERGE - Update prebuilt SDK to LRX14