tree 54de3a43ee6ecac9325f43c1c26d2cfd89ae15c5
parent 4d46224437caf1e65609b963c96640a889768012
parent e0d0b18de077233908da128d61c2b020f9ff527a
author Adam Cohen <adamcohen@google.com> 1345160562 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345160562 -0700

am e0d0b18d: am 8e56a75d: Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev

* commit 'e0d0b18de077233908da128d61c2b020f9ff527a':
  Cleaning up folders for 7-inch and 10-inch UIs