tree bfd99c87e43a3356f1bcb124a71524c482bc2b0b
parent 92d2fae09bfa9ae70abd0fd81d1d2c45ef5e2613
parent d0c806b10c8e45dcfa950adc36742b15edababea
author Adam Lesinski <adamlesinski@google.com> 1444699456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444699456 +0000

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

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