From: Sascha Haeberling <haeberling@google.com>
Date: Wed, 2 Oct 2013 01:14:28 +0000 (-0700)
Subject: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~77
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b8968f2c;p=android-x86%2Fpackages-apps-Camera2.git

am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit '706c985f0a8c8d996b979543a541ed2cb41269e1':
  Deactivate the backup agent in Camera2
---

b8968f2ce791c437322c25ef6e6fdc9d0fa10d65