OSDN Git Service

am 494c02aa: (-s ours) am 8f850b1b: am eb418dba: Merge "Revert "Remove translated...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)
commitda7cac1e6d46ce33b9c8e097b9b17e622535c865
tree3804e07840427a842ef1bdc750bffe2239123c26
parent6eb8cfa7d4530c773ef880b411baba397df23eb6
parent494c02aabeafeab31d7e4f325f68ffd6a2765574
am 494c02aa: (-s ours) am 8f850b1b: am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev

* commit '494c02aabeafeab31d7e4f325f68ffd6a2765574':