| commit | d5b3c0ef64dfc0637d9a43b9dbea91d11889d1b6 | [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 | 3310cb4b239d9b3a4de80c8b295078f1e1602f79 [diff] | |
| parent | b63278f5384c8da2a4ab9a61332caac634aa2c65 [diff] |
resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp Change-Id: I7103bacb1b2d7dc29b4f8d9dddb2fec1feb869d3