diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-28 07:21:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 07:21:22 +0000 |
| commit | 22fdd78ac41d2cea06cc8401960b1a7f53dd2df9 (patch) | |
| tree | 9c96178c637908026d4c70e17defd936314ba2c0 /Android.mk | |
| parent | 2ba7ad37bdaa6870a708d4c9cf050e301646c6d2 (diff) | |
| parent | 17ea9d250ca50ff6a9892625930cb93f7b2294ae (diff) | |
am 17ea9d25: (-s ours) am 076e9841: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '17ea9d250ca50ff6a9892625930cb93f7b2294ae':
Import translations. DO NOT MERGE
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions