OSDN Git Service

am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Oct 2014 22:55:00 +0000 (22:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 22:55:00 +0000 (22:55 +0000)
commit7eb595bd752fcdc0ca77f8a5f9d4282c71866946
treee79cc7a9804e0da882272824206b8ec1e606d991
parent1e637964be1a10b4ff39d49419dda3e8a9e6e552
parent6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2
am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE

* commit '6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2':
  Import translations. DO NOT MERGE