Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master

Browse Source

am: b10be9d131  -s ours

Change-Id: I12b1529c1f983c047e4a1d633ae98a5d0054a65d

main

Bill Yi 2016-06-30 21:48:49 +00:00 committed by android-build-merger

parent 20ac4e9923 b10be9d131

commit a9bfdd4dd2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available