summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-04-29 21:13:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-29 21:13:42 +0000
commitb3988743af7828a0794bfb562b7f6695cf418d7a (patch)
treecff7a16d4153092734b7f58e0c7ff1c335521201
parent5f08b3ec9c1b518583ee527b83854dbf818501f7 (diff)
parent86af7745d337f79b37e25e21f699bf04a46838be (diff)
downloadframeworks_base-b3988743af7828a0794bfb562b7f6695cf418d7a.zip
frameworks_base-b3988743af7828a0794bfb562b7f6695cf418d7a.tar.gz
frameworks_base-b3988743af7828a0794bfb562b7f6695cf418d7a.tar.bz2
am 86af7745: (-s ours) am c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '86af7745d337f79b37e25e21f699bf04a46838be': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions