tree b2ad7958509663b684d1c7fce8a731256ecccc49
parent 5ba6b98cac148e0e5d114ae26127e9189fe6262e
parent 049828caa9dd9733983e1b7bea075f2cea4f7d34
author The Android Open Source Project <initial-contribution@android.com> 1349793119 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349793119 -0700

am df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'df81a1aa1e89da71f02307f7eddb3d1ca5ee4a55':
  Camera2: Don't promote weak IBinder ptrs to strong ones