| commit | 94629bdec34b253fa2e9cd9ec800715b3c3a4f7f | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Aug 06 14:22:09 2015 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Thu Aug 06 14:22:46 2015 -0700 |
| tree | 55279b98607b1bfc1f12f04d375e73cf46b46931 | |
| parent | ee00d9ccfe0092c2d46f1a92a42a2a67982d1c94 [diff] | |
| parent | 779a38a5cd8dab1741ae4a45907bfdf0449bd546 [diff] |
resolved conflicts for merge of 779a38a5 to mnc-dr-dev-plus-aosp Change-Id: Ieaa0dcd8e93fba3060e9a85f17b1f5eabc6b8c9e