OSDN Git Service

am 5974e522: (-s ours) am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip...
authorErin Dahlgren <edahlgren@google.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
commitff2294bf1ad6c1c9b437ce37afca9c7c8a5bd956
tree3804e07840427a842ef1bdc750bffe2239123c26
parentcf3547760d6a638b9898f9b733f9e21097d196df
parent5974e5221e3bf63358e6b42a9085ccc0b0f36b85
am 5974e522: (-s ours) am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

* commit '5974e5221e3bf63358e6b42a9085ccc0b0f36b85':