OSDN Git Service

am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 20 Jul 2015 20:12:55 +0000 (20:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Jul 2015 20:12:55 +0000 (20:12 +0000)
commit5038b92e6adae454feb6095092bdaff80ecf1db3
treea851e0d3e00737ab6e4da021ad8ede4e102c6c3f
parent5cdc7f045f8714f5a9fd00402de5b12d84bba99d
parentddb33d7d879159471cee10bf471a6815e76ac376
am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ddb33d7d879159471cee10bf471a6815e76ac376':
  Import translations. DO NOT MERGE