tree c2ad52888bba6eb568fb304312b7a9b167291f7f
parent eb177d24415a2dd31d1fd3b864f4e65ecf022ff3
parent 338eccc50b5365d18433cc40e550ae01b770ed7e
author Bill Yi <byi@google.com> 1467323473 +0000
committer android-build-merger <android-build-merger@google.com> 1467323473 +0000

Import translations. DO NOT MERGE am: eda3322d78  -s ours
am: 338eccc50b  -s ours

Change-Id: Ia822015ca8b5c624d5cdf9a583ba4294411c1693