tree 6df1d843fb3dc29fc607a45d68bf822ee53b0536
parent bac13378ca2490e98e814908984bc9184ed1d42b
parent 07c6628d68da39582d8d682bc9c849be8bfaaa10
author Jeff Sharkey <jsharkey@android.com> 1446245098 -0700
committer Jeff Sharkey <jsharkey@android.com> 1446245098 -0700

resolve merge conflicts of 07c6628d68 to master.

Change-Id: I29c9b408956c578ce1cfe0eb5d8704b7a5d2f818