| commit | d90238eb150860f94bdae4515cb61515aed1490f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 18:08:15 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 03 18:08:15 2014 +0000 |
| tree | 9f58034024c80bbb921f92b6db287f2074641d4e | |
| parent | cd43c99cce3a0ee0df34be3eda795d1e70497446 [diff] | |
| parent | 2589d8e12de80535defb6e8ddae5ca971a64feb5 [diff] |
am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 2589d8e -s ours * commit '2589d8e12de80535defb6e8ddae5ca971a64feb5': Import translations. DO NOT MERGE