| commit | 7e18ce9d674b4cdc76770c94ea6f476e5941b4f8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 30 17:26:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 30 17:26:02 2014 +0000 |
| tree | f023d42dff1db5bb864920fcf009a346c6afdfe4 | |
| parent | 471d2b3a4a0f632ed581345c8da0cfdf2e208432 [diff] | |
| parent | ea0a298ea63ce6d2ae23fad62209ff7c402c3f02 [diff] |
am 34e83568: (-s ours) am 50708d50: (-s ours) am b3b01a43: (-s ours) Import translations. DO NOT MERGE * commit '34e83568d189050862488df494659db8f6e84d61': Import translations. DO NOT MERGE