OSDN Git Service

am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
authorztenghui <ztenghui@google.com>
Wed, 9 Oct 2013 16:18:08 +0000 (09:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 16:18:08 +0000 (09:18 -0700)
* commit '52beb04d45ff906dfaffb1799a6d93859f1d83bd':
  Fix NPE in video intent.


Trivial merge