| commit | bee9d71293ede690faefd2d36141aece893a9e71 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 21 15:43:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 15:43:30 2014 +0000 |
| tree | 2dfa515d7f0cd019b5c65777d6a6f94e1c49cc80 | |
| parent | fb1810e34f7d61b5b972bf42b09460659b17ee92 [diff] | |
| parent | 9472cadd2219fbe956ea6ba32853efc12abbf69f [diff] |
am 9472cadd: (-s ours) am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '9472cadd2219fbe956ea6ba32853efc12abbf69f': Import translations. DO NOT MERGE