OSDN Git Service

am 1e1dd300: (-s ours) am 7315a189: am c2497d0a: Merge "Show dialog when camera devic...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)
commit45ecac1be75345a6e76cc61c974387075b884538
tree3804e07840427a842ef1bdc750bffe2239123c26
parent3c8fca46071ac5c86089a5800cbdc1991010c9a4
parent1e1dd300c5e31bfcef1f4d281f3fa88bed97f96d
am 1e1dd300: (-s ours) am 7315a189: am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad

* commit '1e1dd300c5e31bfcef1f4d281f3fa88bed97f96d':