OSDN Git Service

am 845dadec: (-s ours) Reconcile with klp-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 22:14:38 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Aug 2013 22:14:38 +0000 (15:14 -0700)
commitb65852d35f31407af42f5c5b96b3a2d9a646c153
tree0531ba39840bf4ffb2af5e35710d9e52c50ad7f3
parent8711cc85125c1f5384d14cfee36deb5771a009a9
parent845dadec2a2cc619d316c44e706b15eba4d75293
am 845dadec: (-s ours) Reconcile with klp-release - do not merge

* commit '845dadec2a2cc619d316c44e706b15eba4d75293':
  Add back DisableCameraReceiver