| commit | 33a5c80773b7b2913c92fec170787499a453d184 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Aug 18 13:07:25 2015 -0700 |
| committer | Jim Miller <jaggies@google.com> | Tue Aug 18 13:07:25 2015 -0700 |
| tree | fec1bfb52460a699ffb1a5bf8426e8a78d923d39 | |
| parent | 2ad94499697d79dc41489ab873527411f88b3f15 [diff] | |
| parent | 448216e7b8822ae9c1c44836482c95f2becc220d [diff] |
resolved conflicts for merge of 448216e7 to mnc-dr-dev Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5