OSDN Git Service

am 1e606658: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:53:14 +0000 (10:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Apr 2013 17:53:14 +0000 (10:53 -0700)
commit0b0a44662d384fe0b59028e280b5ec71cdc1fa2d
tree62713c675640ad51230b7bce38e3cac7c0deffd6
parentc512f6b1e1d0563d659c0f2bb1ad1758f0f471b8
parent1e60665812eea64ac9094882908147cd0dc5d110
am 1e606658: Reconcile with jb-mr2-release - do not merge

* commit '1e60665812eea64ac9094882908147cd0dc5d110':
  am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce