Merge "Tidy up KeyChain OWNERS" am: 28221a4321 am: 03c3b9d226
am: 3b418005bc

Change-Id: I5b3d1f454f7bbc3a55ed15ebd31194383ec57fc5
tree: 9ad62dd4fd2b2ec408de8e60c397070421281b38
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.mk
  7. AndroidManifest.xml
  8. OWNERS