diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-03-14 17:45:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:45:18 +0000 |
| commit | 5225a36cc08b229f52051a01590a05e0bc3e0228 (patch) | |
| tree | a69ec30ec9096ad5273976d9a90d1ef6c3d11e30 /InCallUI/res/values-th/strings.xml | |
| parent | 8bfa8a472e75e9101277fb29331b4c63452ec19f (diff) | |
| parent | e73ebd18fb4564d1a75c9ab87a107896484310ed (diff) | |
am 38b2168e: (-s ours) am 6284d78e: am 94878185: Fix build break due to bad merge
* commit '38b2168eeec31f0b3f749a464c756312c207ca29':
Fix build break due to bad merge
Diffstat (limited to 'InCallUI/res/values-th/strings.xml')
0 files changed, 0 insertions, 0 deletions