tree ade5aafb37be77cbfa12abd61cd3f25c8c4bcd90
parent cfc102685c6e9286f76b8cd5c2ed2318e9b2901e
parent bc7bce38b2e4733a14f6296c75f983bd50f996d1
author Jeff Sharkey <jsharkey@android.com> 1409959710 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409959711 +0000

Merge "Separate active state from open/close." into lmp-dev