| commit | b27a27c2a44db6b61df550697ba7a3734e20ed4e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:47:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:47:41 2015 +0000 |
| tree | 7a79432bb8f78a4fff8ce3fd08610f1cdb155c40 | |
| parent | 2068c6a59a59defa6a0b3c9f157abc834a3866f0 [diff] | |
| parent | 222dead36e3ca93b3e4d79fcd6c10cc7d5115184 [diff] |
am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '222dead36e3ca93b3e4d79fcd6c10cc7d5115184': Import translations. DO NOT MERGE