tree ce0d2527995cae1611de741f461c3055b50f24e6
parent 237ebdf52847a119818aaf6d8a7a1375ecbe1dfd
parent 95529f730ccd7dfafb4bc2024aa156928db3c04c
author Dianne Hackborn <hackbod@google.com> 1362606519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362606519 +0000

am 95529f73: am f6fcea60: Merge "Fix issue #8325007: EyeEm app crashes on launch- NPE at..." into jb-mr2-dev

* commit '95529f730ccd7dfafb4bc2024aa156928db3c04c':
  Fix issue #8325007: EyeEm app crashes on launch- NPE at...