| commit | 4b69cbd6e95da7a209f839804e0fef7494a15459 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Sep 01 09:37:33 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Tue Sep 01 09:37:33 2015 -0700 |
| tree | 809fc868f39d0462cebc8209c23802149fb24745 | |
| parent | 2fcd675b40ad9c94c1ff9506cdea63a48a81c9d6 [diff] | |
| parent | 335e0e08e9d9c0265e0f171dccf8d9a7790e2218 [diff] |
resolved conflicts for merge of 335e0e08 to mnc-dr-dev-plus-aosp Change-Id: I77587cf9128b003ed0f77ddfe11e688dcfe37a9c