tree 790c8e37506b5f3a1b25931c481e20e5d8359c7e
parent b905a37c7a18e8ad98497dea5ab7bd016e3c995d
parent 4a1cb22056112f7ffd5f4fad8b7a092b96e7cc7b
author Craig Mautner <cmautner@google.com> 1387477790 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1387477790 +0000

Merge "Pair ActivityStacks with Displays" into klp-modular-dev