| commit | 596e8588b181f33e232788379f5ceca35d3afb50 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Apr 25 16:31:30 2016 -0600 |
| committer | Jeff Sharkey <jsharkey@android.com> | Mon Apr 25 16:40:38 2016 -0600 |
| tree | 793837372f24ba5e94ec7ea636aa28864e5106e3 | |
| parent | 995780ce242df841b2852ed82d546bc1808bdef8 [diff] | |
| parent | d1153a31d7ac0f5d5cd85d498a35affa9a66e721 [diff] |
resolve merge conflicts of d1153a3 to master Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267