Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 56f6d266be
am: 0b20e250df

Change-Id: Ie8a413a16ba4120a5f4f435e664a7c8e2adfbaf2
tree: 27ef4a3c6afc7a1dbcfc3f071afa84573883ed43
  1. core/
  2. qr_scanner/
  3. Android.mk
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. README.version