tree 3d90b36324b45e40bc11bc3739b51fbe0cb6306f
parent d3330b8862422c5ed1ca093e050080c2f61bf474
parent 6029dfa81a01ab41318a8e9601448387179f8703
author Adam Lesinski <adamlesinski@google.com> 1444676803 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444676803 +0000

am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"

* commit '6029dfa81a01ab41318a8e9601448387179f8703':
  Make 'idmap --scan' accept more than one input directory