OSDN Git Service

am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
authorGeoff Mendal <mendal@google.com>
Wed, 29 Oct 2014 22:54:52 +0000 (22:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 22:54:52 +0000 (22:54 +0000)
commit1e637964be1a10b4ff39d49419dda3e8a9e6e552
treee79cc7a9804e0da882272824206b8ec1e606d991
parentffc766e0db2858182b6226ac5a51a19327765a82
parent062afd5964003e482ce6dfd2b2443413f594ee4e
am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '062afd5964003e482ce6dfd2b2443413f594ee4e':
  Import translations. DO NOT MERGE