| commit | 87108c8530cd7f8297c40fa99a50fbc0e1f983cf | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat Aug 01 11:01:00 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Sat Aug 01 11:01:00 2015 -0700 |
| tree | 3291bb95cad927ad26f6adc00154ea887e9b3edf | |
| parent | 3e845dce3304b6685624c580d1a132957d2dd238 [diff] | |
| parent | 0f32d65d6c4b4c6af73b71bcda4e671902f699db [diff] |
resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp Change-Id: I7da3ba971ccaf566be3e490846e5e306cdd2cf28