| commit | 2fa5c2645e1a271da125efa46c07e9529ef44d24 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Tue Oct 20 16:04:59 2015 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Tue Oct 20 16:04:59 2015 -0700 |
| tree | 4ce3378ecf94e7f4886206f58a6ce9bc3dcc38da | |
| parent | 8fa7e23b3205016b1f8e55668a7b621162bcb841 [diff] | |
| parent | 071352de9e7e74c9a73280937cbf67d10da441b2 [diff] |
resolve merge conflicts of 071352de9e to master. Change-Id: Ib777927fd479fcb567d005910930fda7354865d0