am a969285f: am 2c9b0ee0: Merge commit \'cb9844add29614cd9e36fe1aeee5fecfa02522a3\' into HEAD

* commit 'a969285f70219c5d35ee5aa8ceab0f532fc1e54d':
tree: 961dfef28571e02a7d969fbba9bb51991086476b
  1. include/
  2. src/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_GPL
  6. NOTICE