tree 172a673311c10ab57d641f19408f65f1144c1c5e
parent f17285c4659e859b1252f6c529018b8e79666a6d
parent b8a48da2a707720a105584f1b8dc087a6dd9c887
author Jeff Sharkey <jsharkey@android.com> 1379879980 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379879980 -0700

am b8a48da2: am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev

* commit 'b8a48da2a707720a105584f1b8dc087a6dd9c887':
  Create unique files, root ordering, UI bugs.