| commit | 5aaecd4cf7b9b96a13f61416f10b3022a30274ce | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 16:13:09 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Aug 20 16:13:09 2015 -0700 |
| tree | fca0b2e1ba44d9c3cf534e381c5e00333e336025 | |
| parent | 7503844618a7a6fc02481d4d80e9848c66b38b02 [diff] | |
| parent | 69a4f94967fe9dedff867e964c1db1e36ce73339 [diff] |
resolved conflicts for merge of 69a4f949 to mnc-dr-dev-plus-aosp Change-Id: I8b8c17f74a3de3d9f8a9696c0895e62019f831a7