tree 4b735c78495daa589df1827cb5b1d3617faaccc2
parent 9b36f526dd0378bda8f71c0e51ed37bf97742f8f
parent 692a244bffea11157c37c8de93482cb912599b98
author Dianne Hackborn <hackbod@google.com> 1438371744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438371744 +0000

am 692a244b: Fix build.

* commit '692a244bffea11157c37c8de93482cb912599b98':
  Fix build.