| commit | de2c8a24cedd7f75ab43f634535c143f1c5be479 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 02 21:09:32 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Sep 02 21:09:32 2015 -0700 |
| tree | a31987017a5be6738bca56dcd907a31fb7ea70af | |
| parent | 259ad4a8e798025119b0cec3c11199239b59fa12 [diff] | |
| parent | e94369085f89074f9e23064bc17164b516dea159 [diff] |
resolved conflicts for merge of e9436908 to mnc-dr-dev-plus-aosp Change-Id: I6204a8463c553779c690bb29447a66cafe4d1038