commit | 4c042b096e3b25f7292d13b4c44d79cb79ebeb36 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jan 11 15:51:36 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 15:51:36 2016 +0000 |
tree | b64520b487c96afa51a8fa117733868e4011bccc | |
parent | ddee7d949dbd1fd5d18e11322532e78cd8330554 [diff] | |
parent | 8635657b176ee9f80e8f57a7d1da9278722ff8a0 [diff] |
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours am: 0663959eb7 -s ours am: 8635657b17 -s ours * commit '8635657b176ee9f80e8f57a7d1da9278722ff8a0': Revert "Import translations. DO NOT MERGE"