tree 8d00f7b2cf5993016f98b16aae217f22f98f9d85
parent 7979e170b5bdfb6922d758f2c66f06829b6b5d9b
parent bb77d99c257bc4a3371548c4bc8ba7088fa76005
author Jeff Sharkey <jsharkey@android.com> 1380218448 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380218448 -0700

am bb77d99c: Merge "Directories are always enabled; update assets." into klp-dev

* commit 'bb77d99c257bc4a3371548c4bc8ba7088fa76005':
  Directories are always enabled; update assets.