| commit | 46bf9386c9dfcdaa92aa20e822118196f953a296 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 13 17:53:56 2015 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Wed May 13 17:53:56 2015 -0700 |
| tree | db527bbe3399be36c6ff2802e5dd585bb422097f | |
| parent | 55c2aa82128895b19de6060394552b84f4ee2d42 [diff] | |
| parent | cdf0d03deb539dd92d5752d237127b74406c631f [diff] |
resolved conflicts for merge of cdf0d03d to mnc-dev-plus-aosp Change-Id: I1ed785690cda26723adef146e211f61bded0d8fe