| commit | ac116f7a2471bf011ab0a3b7d3908a4ae7c3e36c | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Tue Apr 28 11:10:49 2015 +0100 |
| committer | David Brazdil <dbrazdil@google.com> | Tue Apr 28 11:10:49 2015 +0100 |
| tree | 60b122ece08b503b9f1d020306ab4151d4680ae6 | |
| parent | a7fefb70474a61e60168000f0d197384acd417d7 [diff] | |
| parent | 2b1c622d5db941fe06b3ea9c1a5366358fa298c6 [diff] |
resolved conflicts for merge of 2b1c622d to mnc-dev-plus-aosp Change-Id: I26f4aefa7d7384bbc64c7a3c9e312692071a0e62