OSDN Git Service

am 9eeae334: (-s ours) am b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:26:05 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:26:05 +0000 (17:26 +0000)
commitf147fda7e643df2d730c0aec502467f3b0c165b5
treeb3f336f2df2223e420da65cdd8f542120d2c8d36
parent6bd274fc8ac2817931a7f4af26f7a2b4dfc23754
parent9eeae3346f92865d724ae3ea8b41c6ac63eb462c
am 9eeae334: (-s ours) am b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9eeae3346f92865d724ae3ea8b41c6ac63eb462c':
  Import translations. DO NOT MERGE