OSDN Git Service

Merge "Fix a regression in assist when context is disabled" into nyc-dev
authorAmith Yamasani <yamasani@google.com>
Sat, 23 Apr 2016 01:01:58 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Apr 2016 01:01:58 +0000 (01:01 +0000)
commit40411c158c8b071ba9175f514b1fa370ff438cc5
tree57e3bf44ea2b32aed56e0c323dd5aba36f386bd4
parent2494361b0ba220038f24613da21f3e0fcdaacc1b
parentc3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36
Merge "Fix a regression in assist when context is disabled" into nyc-dev
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
  Fix a regression in assist when context is disabled

Change-Id: I6209180e67e91ac264e50be957d87c2d897bcc3c