summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2013-04-30 14:05:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 14:05:23 -0700
commit2e5fca0359481e3b96941031c4c4c5d1afa8d34b (patch)
treeab989a58a37927754311fb8421b73f900930b71e
parent266ad7d2d20f3327de80eb8a2888772dc9f6ed86 (diff)
parent89da20f91684cd29065935675dde199e110a0509 (diff)
downloadandroid_frameworks_ex-2e5fca0359481e3b96941031c4c4c5d1afa8d34b.tar.gz
android_frameworks_ex-2e5fca0359481e3b96941031c4c4c5d1afa8d34b.tar.bz2
android_frameworks_ex-2e5fca0359481e3b96941031c4c4c5d1afa8d34b.zip
am 89da20f9: (-s ours) am 43db8085: am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit '89da20f91684cd29065935675dde199e110a0509':
0 files changed, 0 insertions, 0 deletions