| commit | fdf14874930e92933eda7c756fd3bfe1f5e6c09a | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Aug 06 12:50:48 2015 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Thu Aug 06 12:52:25 2015 -0700 |
| tree | 29031c373fe10326a791f1a968199a9202015653 | |
| parent | 0e3b339bbb43a058b4c8397655b31d774b9e1d3a [diff] | |
| parent | b9f438ff841f87c8ffbca85b13a533718a18e15f [diff] |
resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp Change-Id: I7103bacb1b2d7dc29b4f8d9dddb2fec1feb869d3