OSDN Git Service

am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2...
authorSascha Haeberling <haeberling@google.com>
Wed, 2 Oct 2013 16:37:04 +0000 (09:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 16:37:04 +0000 (09:37 -0700)
commit4f4e12c6cabe33152c6f974f8168e9f76d842c65
treef1a52d3ccdbb744eadca88ebc11cd8a7c8dd35bf
parentcf087b416532547626ec193b920757d5095ce0ac
parent3c45c0c0b250eecd2a589a3616a14dea195564a8
am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit '3c45c0c0b250eecd2a589a3616a14dea195564a8':
  Deactivate the backup agent in Camera2