Merge "Make it possible to store multiple hashes in hash.txt"
am: 0b9648d438

Change-Id: I009118cd6a77da87bea748ed90649160b1d00ac6
tree: fbecccee63c39b36632bc17ece4338cd489837e5
  1. apexd/
  2. apexer/
  3. proto/
  4. shim/
  5. tests/
  6. CleanSpec.mk
  7. OWNERS
  8. PREUPLOAD.cfg