tree 2aca728de2682f9099121b7ea06da515edad70c9
parent 6486324d24d47a1a8d18a0314722f466a5ace48b
parent 3b543ca859989af2ba9d1bc7b5393dae7ffed874
author Chris Wren <cwren@android.com> 1454687438 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454687438 +0000

Merge "Revert "move assistant to system API""