diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-11 13:56:13 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-11-11 13:56:13 -0800 |
| commit | 0d00a83fcea7bf96e118d0271ed807a3f39f0bc4 (patch) | |
| tree | 62edf412a99d99f708a86b344e404b17bb443016 /res/values-hu | |
| parent | 1d9c95c9d31f71519d72b60e5af9cd64822ed87b (diff) | |
| parent | ebf4b36e17dd0a63f293a618a6d1bcea98a69bd3 (diff) | |
| download | packages_apps_nfc-0d00a83fcea7bf96e118d0271ed807a3f39f0bc4.zip packages_apps_nfc-0d00a83fcea7bf96e118d0271ed807a3f39f0bc4.tar.gz packages_apps_nfc-0d00a83fcea7bf96e118d0271ed807a3f39f0bc4.tar.bz2 | |
resolved conflicts for merge of ebf4b36e to master
Change-Id: I73a3025a35da21db6600b6e82c99836641e9bee7
Diffstat (limited to 'res/values-hu')
0 files changed, 0 insertions, 0 deletions