diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-01 19:47:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 19:47:59 +0000 |
| commit | 28333368c78f7781fba295f0c7e84928a4653740 (patch) | |
| tree | 9b47b3a874c0c2848aaecf33614be35ea83eb878 /proguard.flags | |
| parent | 2fd61cfbc12d9b20b9bde75dcb9381449b80d72e (diff) | |
| parent | e8f7e8d6a0413e39fbcd18c7dedf7898e304b999 (diff) | |
am e8f7e8d6: (-s ours) am 5bba5aea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e8f7e8d6a0413e39fbcd18c7dedf7898e304b999':
Import translations. DO NOT MERGE
Diffstat (limited to 'proguard.flags')
0 files changed, 0 insertions, 0 deletions