tree 54d29db81c01c6b3556027c12352766fd86ecd8d
parent 4a30d627a25f2e6cf3d699c4949919aae7ca7063
parent 44b50ad313e827f03391ebac47f3db6308b52d42
author Selim Cinek <cinek@google.com> 1416836378 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416836378 +0000

am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev

* commit '44b50ad313e827f03391ebac47f3db6308b52d42':
  Fixed build breakage due to api change.