Merge commit \'02de621133c35cbdb7012866d11cf10627540074\' into HEAD am: 59f2e9f65e
am: fbb5677882

* commit 'fbb56778822183f46d024ef2c4d46634bff4dab8':
tree: f3be7fd993cf8823bc702570c79e6bfa5b94b7fd
  1. halimpl/
  2. src/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE