tree dc291d4f5248afcca438d77848589bc26626628d
parent b080a7392c5910219e315c46fa12c5f4733059ce
parent 3146eb76cf193ce95f0f88a477b1c708a1b5cf9b
author Kenny Root <kroot@google.com> 1311025641 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311025641 -0700

am 3146eb76: am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"

* commit '3146eb76cf193ce95f0f88a477b1c708a1b5cf9b':
  Avoid complaining about empty directories