OSDN Git Service

am df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:31:59 +0000 (07:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 14:31:59 +0000 (07:31 -0700)
commitd92e9a30bf30151099468dece88c8dda52b9186c
treeb2ad7958509663b684d1c7fce8a731256ecccc49
parent5ba6b98cac148e0e5d114ae26127e9189fe6262e
parent049828caa9dd9733983e1b7bea075f2cea4f7d34
am df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge

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