| commit | e21dfd028d218ccc19be6a52cc9c4050cf429378 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri Aug 21 14:07:34 2015 -0700 |
| committer | Chad Brubaker <cbrubaker@google.com> | Fri Aug 21 14:07:34 2015 -0700 |
| tree | 9512df98fb2e132883fc16e14f7f47949c98bb6c | |
| parent | 0c9e64b3b451f95db8d1cb5ca5bf1449ea97d480 [diff] | |
| parent | b571ecfd6f7281ee6192c6bc62ce5ea59521367a [diff] |
resolved conflicts for merge of b571ecfd to mnc-dev-plus-aosp Change-Id: I085da358f0ec517c0e6530eb22b5206981d1a8db