| commit | b0bdf697ca62d21353284cd2c5fcc0acd45ad52f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 15:03:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 15:03:26 2015 +0000 |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d | |
| parent | b0697e2ae1d5d11e89143f94225723b5365cc4e9 [diff] | |
| parent | 40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f [diff] |
am 40359e03: (-s ours) am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f': Import translations. DO NOT MERGE