OSDN Git Service

am c487b900: (-s ours) am 210b38d7: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 05:32:55 +0000 (05:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:32:55 +0000 (05:32 +0000)
commit55b4f056e0c2d69eefdb2c9f9056b2239301ad31
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent4dca506b0c630f3a3ec13de075c429e8a95b9646
parentc487b9008d26a0f581c78c28e6ee55b3cb0c342b
am c487b900: (-s ours) am 210b38d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c487b9008d26a0f581c78c28e6ee55b3cb0c342b':