OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
authorBill Yi <byi@google.com>
Tue, 21 Jun 2016 17:02:49 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 17:02:49 +0000 (17:02 +0000)
commitfc4fb605979a7d6a077d0d03df4271e12ceccf20
tree6910d17d99ad18d502812a1587bd53064260b01c
parent9cfd92d7d8eb159a27053839bbc906ad7250c187
parent440199c6c4ca9ae12b823c2458f43a7c1753130d
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0  -s ours
am: 440199c6c4  -s ours

Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef