tree 57b93240e1a76af192798bca98484c4034b550bf
parent 41c684a7b5602991cb1af63b2bcaa4e41812dfb9
parent 95da1087ed3c7b9983b571bc5409827ae390f15f
author Craig Mautner <cmautner@google.com> 1393353961 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1393353961 +0000

Merge "Clean up activities and displays when done" into klp-modular-dev