summaryrefslogtreecommitdiffstats
path: root/nfc-extras
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-04-04 14:44:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 14:44:42 +0000
commitf1e27b586f1975441ec2f913597f5d64f1f7ed08 (patch)
tree73b07a8490f3ab95a23e31af027199ec31b7c356 /nfc-extras
parentda1cef3603205d09e1fc07c1ef8dbe3db4f40aef (diff)
parent696601704ecfc23d9f8e4e184b2a78c049add6d7 (diff)
downloadframeworks_base-f1e27b586f1975441ec2f913597f5d64f1f7ed08.zip
frameworks_base-f1e27b586f1975441ec2f913597f5d64f1f7ed08.tar.gz
frameworks_base-f1e27b586f1975441ec2f913597f5d64f1f7ed08.tar.bz2
am 69660170: (-s ours) am 87210ee9: (-s ours) am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '696601704ecfc23d9f8e4e184b2a78c049add6d7': Import translations. DO NOT MERGE
Diffstat (limited to 'nfc-extras')
0 files changed, 0 insertions, 0 deletions