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

Change-Id: Ib315a7acfd91f894f69283bc85e789c50d74c620
tree: 8a4d7e9583397257d3c71607f66cde9abc0f578a
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml