tree 11ec5e364e7287e4e4aeadb53cb4d78cbc4dad6b
parent 54c8ac3d6f7167048afa3aaad4bcda2c338936a1
parent 914afbfbd048721fb9ece683b9e881b79a01e34e
author TreeHugger Robot <treehugger-gerrit@google.com> 1478116242 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1478116246 +0000

Merge changes I7ef5921c,I3bbd09c5

* changes:
  Create test for CategoryManager.
  Backward-compat for DashboardCategory with app use old keys