summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-07-06 18:44:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-06 18:44:43 +0000
commit3f76500d39d1cd08f3cd2e1379c7f61597978fe0 (patch)
tree6398c5fc86fba7e13e3b3eda6d3494ae40e81404
parent2f39b333a32f9849bf174e3ea8b3d552e11e372c (diff)
parent000bd2527105f0bdf825a65cbf82a1133d1e0bae (diff)
downloadandroid_frameworks_ex-3f76500d39d1cd08f3cd2e1379c7f61597978fe0.tar.gz
android_frameworks_ex-3f76500d39d1cd08f3cd2e1379c7f61597978fe0.tar.bz2
android_frameworks_ex-3f76500d39d1cd08f3cd2e1379c7f61597978fe0.zip
am 000bd252: (-s ours) keep history after reset to a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac
* commit '000bd2527105f0bdf825a65cbf82a1133d1e0bae': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions