| commit | 9dc6bda43f0767a1ecb3f901d9be0f523e9463f1 | [log] [tgz] |
|---|---|---|
| author | xinhe <xinhe@google.com> | Wed Aug 05 15:17:22 2015 -0700 |
| committer | xinhe <xinhe@google.com> | Wed Aug 05 15:17:22 2015 -0700 |
| tree | 68208bfb27666f895e8a5ca1f70914d3e7d6759e | |
| parent | 0cc09187b578a328f945cd58f0c030c4b713d37e [diff] | |
| parent | ee0a0132ebb0d7e9baf42e778ea9c094966ffb14 [diff] |
resolved conflicts for merge of ee0a0132 to mnc-dr-dev Change-Id: I61046edb56b9b54a759e4964762fa7b01d4eaba1