OSDN Git Service

am 26a3e949: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 26 Jan 2015 15:20:04 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Jan 2015 15:20:04 +0000 (15:20 +0000)
commit849673eddda7924d33b18b25bf81758ffab7eebe
treedd39a48c9948fa54ca9fb895a54d1d88871275ef
parent956fb8caf1af11d09e7370d236c70766114f95c1
parent808ac6cd14ee4061adc49d78f218a0f4142c153d
am 26a3e949: (-s ours) Import translations. DO NOT MERGE
automerge: 808ac6c  -s ours

* commit '808ac6cd14ee4061adc49d78f218a0f4142c153d':
  Import translations. DO NOT MERGE