| commit | 44ad3ac50aca8ec2fc23ad1ac9defdc1446d518b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 11 18:41:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 18:41:56 2016 +0000 |
| tree | fe67a59efa0ed65fbfdce79a4d9bb59267fad6ff | |
| parent | dfe384fed881eaab1d7585fb4e23edfab0823c33 [diff] | |
| parent | f68020abf3a51ffefcf3cd8d2043684501b6f3ce [diff] |
am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: f68020abf3 -s ours * commit 'f68020abf3a51ffefcf3cd8d2043684501b6f3ce':