| commit | 7d1428d7f3005abe23328c629ad33998f23cb575 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Tue Nov 17 15:38:50 2015 -0800 |
| committer | Rom Lemarchand <romlem@google.com> | Tue Nov 17 15:38:50 2015 -0800 |
| tree | 00d2e7bc5d93342a725a11655e017c61e5816417 | |
| parent | b39fde2c42b7bb4450eb40a19c6fe9c4f743bd9d [diff] | |
| parent | 5032e49f9e8ec8307dbc265a78649c2b49e4e5ad [diff] |
resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp. Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f