tree 274ec6a62b48faa8fb2a33e6c8bb362c95d5819c
parent e8a23195805f7cca255a3928184cacc68cd65ad0
parent d77e675d5f206f8e9825b2fd99908d7cf0583544
author Jeff Sharkey <jsharkey@android.com> 1481589096 -0700
committer Jeff Sharkey <jsharkey@android.com> 1481589096 -0700

resolve merge conflicts of d77e675 to master

Change-Id: I211db442e0081ee51f889b1fe788dad08889c2ec