| commit | 0f3e20658a2386b68f23c71a83e18b9423e939e9 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Feb 14 16:22:50 2014 -0800 |
| committer | Qiwen Zhao <zhao@google.com> | Fri Feb 14 16:22:50 2014 -0800 |
| tree | c3f7b6bda200951ea4adfdde8bd41a58bcf2664a | |
| parent | ec3aad2e30ead7923f659c197c57f843cc55c913 [diff] | |
| parent | 8fa85d2025902d15f40edff3255d99422685d9de [diff] |
Merge commit '8fa85d20' into klp-dev-plus-aosp Conflicts: res/values-lo-rLA/strings.xml