tree ae7892b0a4b1b9fb495c2ffbe0ffaa86e83fa3f6
parent 64a0f914a137ae05f8f9719b6f27c4c81eee3a0f
parent 299942002b17f792e6e4f6b3f6972f62b8b136ae
author Marco Nelissen <marcone@google.com> 1357753765 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1357753813 -0800

Merge "Fix media scan NPE"