tree 2642a4289d8c22512c5d243f6090a82f2698a38d
parent 4b315b35b0744ce8dd9fb833317aaa2e6d48ca63
parent 4e69dfed0b0fe672e366bb84d5c3feaedc61d630
author Wu-cheng Li <wuchengli@google.com> 1279572646 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279572646 -0700

am 4e69dfed: am 9d1f5afc: bionic: update processed kernel header msm_camera.h

Merge commit '4e69dfed0b0fe672e366bb84d5c3feaedc61d630'

* commit '4e69dfed0b0fe672e366bb84d5c3feaedc61d630':
  bionic: update processed kernel header msm_camera.h