am 87adbf52: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:08:31 +0000 (10:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Apr 2013 17:08:31 +0000 (10:08 -0700)
* commit '87adbf5234355371b0284353d03980b65b45b23c':
  libcamera2: Protect in-flight counts.


Trivial merge