[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: ebb870f828  -s ours

Change-Id: I0f2a84ae54c2fc272f857edb750c90aceadadfda
tree: 2c3c8270dab90b52f181e131956890f39c9299f8
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml