OSDN Git Service

am 94c40a4c: resolved conflicts for merge of 1b5b60d6 to master
authorAdam Lesinski <adamlesinski@google.com>
Tue, 4 Feb 2014 19:03:35 +0000 (11:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Feb 2014 19:03:35 +0000 (11:03 -0800)
commit3d650b95655b63a79b43e2cd1d2568489f4fbe6b
tree934eca4567c0d8c39da52094ef150cf4bec8a790
parent7890a755f3b4bb2446fdfdc4940af532f2b64f69
parent94c40a4cf90933216e6d656213dfdfa19c68a9c3
am 94c40a4c: resolved conflicts for merge of 1b5b60d6 to master

* commit '94c40a4cf90933216e6d656213dfdfa19c68a9c3':
  Add support for multiple asset dirs (-A)