OSDN Git Service

am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are presen...
authorErin Dahlgren <edahlgren@google.com>
Tue, 1 Oct 2013 23:41:14 +0000 (16:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Oct 2013 23:41:14 +0000 (16:41 -0700)
commitb763357340619b188d0d536e31c5e7ddbcfec595
treecf3df1c90fcf461ebf211ef845af57e3e91ac42d
parentc4810a331b4420a18e8925afd61b0a0006943704
parent852853c8ac10aeea3f8df0ec53d8f2ae203e0a5e
am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

* commit '852853c8ac10aeea3f8df0ec53d8f2ae203e0a5e':
  Fix FilmStrip crash by checking if photos are present before updating action bar