tree 7fe56af72d417d33f48a4422117f8908c9407e4a
parent 5a02d4c325e51617cab319d3e104f6e1c24b8f36
parent 1ba0a30e6545a8c313d0ef355a101f661bbf778c
author Winson Chung <winsonc@google.com> 1389913655 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389913655 -0800

am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit

* commit '1ba0a30e6545a8c313d0ef355a101f661bbf778c':
  Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)