tree 0205817a3a0880b255b45646e666d3b784134504
parent 5138d79e89e1678d411e2a5b9a5e445aaf04fb3a
parent d254ce4ed17ec25e8e879d1026b704c72678e307
author Jeff Sharkey <jsharkey@android.com> 1467844003 -0600
committer Jeff Sharkey <jsharkey@android.com> 1467844003 -0600

resolve merge conflicts of d254ce4 to master

Change-Id: Ia8dff82cb7648b568006d10bc99e2dd40a2d6e8e