tree c39327d186751f858f125437fde49716ae3d5797
parent aee4f90bfe7a774ff726b8c8c561b483d759f8aa
author Jeff Sharkey <jsharkey@android.com> 1458234372 -0600
committer Jeff Sharkey <jsharkey@android.com> 1458236084 -0600

Follow framework refactoring.

Bug: 27531029
Change-Id: I9684c72d6ca0e4eb90bf9300275dcbfa3fc7571c