tree 2f6f186475b45daed0d1735c6b6a918adeb5ab8c
parent fb86919503ce627e3993da2c717f067206228746
parent ce46ad2add6a3bbcacc27b5ff0ccc4589d848e64
author Winson Chung <winsonc@google.com> 1389913799 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389913799 -0800

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

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