OSDN Git Service

am d0c806b1: am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than...
authorAdam Lesinski <adamlesinski@google.com>
Tue, 13 Oct 2015 01:24:16 +0000 (01:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2015 01:24:16 +0000 (01:24 +0000)
commit4ffea4e4da10c14203a690d67cadf5b39489f84c
treebfd99c87e43a3356f1bcb124a71524c482bc2b0b
parent92d2fae09bfa9ae70abd0fd81d1d2c45ef5e2613
parentd0c806b10c8e45dcfa950adc36742b15edababea
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
core/jni/android_util_AssetManager.cpp