tree 8a8fd1122e4da4ebcd565539f75e7a6f1ac24a87
parent f5b0bf356350b53d02d6dfea96defd087f8c2f2a
author Jeff Sharkey <jsharkey@android.com> 1464986056 -0600
committer Jeff Sharkey <jsharkey@android.com> 1464986056 -0600

Fix build after merge.

Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef