| commit | 65789abc274c794e716d9969a53496dd71ad9925 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Sep 07 10:00:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 07 10:00:30 2015 +0000 |
| tree | 01d285d2ccc18d902ce93088064090d6e64cba58 | |
| parent | 555aa31881077740836efcf3f6512ae64707751b [diff] | |
| parent | cb3505ce3b9d03a10e03749697d56fa0c6d05a0a [diff] |
am cb3505ce: am 49cbb073: Merge "Finalize .conf file" * commit 'cb3505ce3b9d03a10e03749697d56fa0c6d05a0a': Finalize .conf file