Merge "packages/apps/KeyChain: Set LOCAL_SDK_VERSION where possible." am: 2c7fb841f5 am: ce51d43bfe
am: a991291318

Change-Id: I3e52bdb1d711f07b93b803893672aa98b11ffbe5
tree: 2d1ce01590e20196ff3b1be58c6edf27bff8c5f9
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.mk
  7. AndroidManifest.xml