| commit | cb3505ce3b9d03a10e03749697d56fa0c6d05a0a | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Sep 07 09:52:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 07 09:52:43 2015 +0000 |
| tree | 2a11099718a241e7978f83de0639f95bbd3ab8ca | |
| parent | d0d815f5c7892a302d0d4961b26d90d6539f909f [diff] | |
| parent | 49cbb073c0d8c6ab3ac4c8a37792844836d5c80c [diff] |
am 49cbb073: Merge "Finalize .conf file" * commit '49cbb073c0d8c6ab3ac4c8a37792844836d5c80c': Finalize .conf file