tree 0ad2b0fd0ecc0a46807cd1ffd4ec63c1c482ec14
parent 9c437bcb57a7cf5eb3bd1a85a4f2322fd34f50a3
parent cd30bb6c710d40839bc8b4d6edcb866f13342b5a
author Jeff Sharkey <jsharkey@android.com> 1380218744 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380218744 -0700

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

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