commit | 68e77434d8967baf7f1a5b79a61febcc60e6cb0a | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Tue Aug 04 14:32:37 2015 -0700 |
committer | Tao Bao <tbao@google.com> | Tue Aug 04 14:32:37 2015 -0700 |
tree | e9370f13fe557460523708ca41015aec7755e7ad | |
parent | ddbfdf79518699b232837bae1052e70b701bd524 [diff] | |
parent | 5aa3ce3aaa12541d05fb613b4e74afe1f4d15171 [diff] |
resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp Change-Id: Iba4d2e5c5c7d0e0c1088403ff32d8f0d12da925d