| commit | 307ed40360a7ec6a55a7b42457662ca439fa2b45 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 11 18:19:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 18:19:08 2016 +0000 |
| tree | 741aebaf37dec3dd2e2b3f3e1669d57b780d3365 | |
| parent | f8642182b7c1d2274873d08169098fba19ed4932 [diff] | |
| parent | ffaba5f3ece78d84dae8daeeb21ad6faa76e697d [diff] |
am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: d6a9daa65e -s ours am: ffaba5f3ec -s ours * commit 'ffaba5f3ece78d84dae8daeeb21ad6faa76e697d':