OSDN Git Service

am 0b0a4466: (-s ours) am 1e606658: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Apr 2013 18:27:42 +0000 (11:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Apr 2013 18:27:42 +0000 (11:27 -0700)
* commit '0b0a44662d384fe0b59028e280b5ec71cdc1fa2d':
  am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce


Trivial merge