Merge commit '7b6b6a2c' into honeycomb-plus-aosp
tree: 5c92f196c0ff720018d2705cd268cacacae4c47b
  1. inc/
  2. src/
  3. Android.mk