summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2013-04-30 14:05:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 14:05:13 -0700
commit1754ae833b5ba57dafbf3b4970abb553191afe55 (patch)
treeab989a58a37927754311fb8421b73f900930b71e
parente91d9ea7c7013c42bb6f38ebe3832725e063ec52 (diff)
parentf2eece8791cfe8851040152d027c105263482cfd (diff)
downloadandroid_frameworks_ex-1754ae833b5ba57dafbf3b4970abb553191afe55.tar.gz
android_frameworks_ex-1754ae833b5ba57dafbf3b4970abb553191afe55.tar.bz2
android_frameworks_ex-1754ae833b5ba57dafbf3b4970abb553191afe55.zip
am f2eece87: (-s ours) am e0502615: am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'f2eece8791cfe8851040152d027c105263482cfd':
0 files changed, 0 insertions, 0 deletions