| commit | 9d2b673a5fe2f003c30521774b6518bbba72f9bf | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Dec 10 16:00:39 2015 -0800 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Thu Dec 10 16:14:57 2015 -0800 |
| tree | 36cdf7db9437c1f4384eb01e148916505991cfa2 | |
| parent | a56df600389bb1fd05ca86fdbd6c26942f2dcbe6 [diff] | |
| parent | 819dc2b3ca09bf0237b99271f5664b4aec0ea35b [diff] |
resolve merge conflicts of 819dc2b3ca to mnc-dev. Change-Id: I89373c4f31b10f58fbac39c627e57fc3f37a44ef