summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2013-04-09 12:32:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-09 12:32:03 -0700
commit8448c8f65b6f12c9e20e264cf124f8a398cf0b80 (patch)
tree57e49da0b90565c76a1394b8a875fc22e9ae0369
parentd46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2 (diff)
parent4cdee7a61b140cf1a38b3d1eb1ac596525aa609b (diff)
downloadandroid_frameworks_ex-8448c8f65b6f12c9e20e264cf124f8a398cf0b80.tar.gz
android_frameworks_ex-8448c8f65b6f12c9e20e264cf124f8a398cf0b80.tar.bz2
android_frameworks_ex-8448c8f65b6f12c9e20e264cf124f8a398cf0b80.zip
am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '4cdee7a61b140cf1a38b3d1eb1ac596525aa609b':
0 files changed, 0 insertions, 0 deletions