tree 84643089e2723ef1049eb7541aaf64515be4e1a9
parent c82bcca5510a3d21113e7fbab16bbfe4d124e934
parent 778029776bac60856af7e97e19deb7b1f42b1984
author Marco Nelissen <marcone@google.com> 1374875700 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374875700 -0700

am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"

* commit '778029776bac60856af7e97e19deb7b1f42b1984':
  Fix NullpointerException in MediaMetadataRetriever