tree b6903c932c3a57b34be66d6987453307f49ceb8a
parent 88c74baa6aaeb0a8e0813c417b03fbaec151d7e2
parent 09e174875c23eb7ca9cd78655103d11d6d110fe4
author Vadim Tryshev <vadimt@google.com> 1436493177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436493177 +0000

am 09e17487: am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev

* commit '09e174875c23eb7ca9cd78655103d11d6d110fe4':
  Fixing a crash introduced by my previous CL.