| commit | bd0746cc000e4f9b969247ddcdd59a19f4ee1ab2 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 20 18:55:08 2015 -0700 |
| committer | Stephen Hines <srhines@google.com> | Thu Aug 20 18:55:08 2015 -0700 |
| tree | fc6e7149bbc80acdb9ae99f0bb7fdc03a6ac4445 | |
| parent | 8de2d0fd66077b2bbb9eebd6b2547e1dcd3cb14e [diff] | |
| parent | 2e0c91eabdebc6a1bc7e3b88c657d14b7f6f4211 [diff] |
resolved conflicts for merge of 2e0c91ea to mnc-dr-dev-plus-aosp Change-Id: Ie4348b54190109a0612c99611f64f7d799fd5833