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:02:02 +0000 (01:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Apr 2016 01:02:02 +0000 (01:02 +0000)
commit074139b878315913ba2ae78aa0d212cade94e02c
tree8542868dc8ed3120b4409bd9bd3985ec515fbf8a
parent8414b87f6cfc122af50ecddb5082f691fccf2c4c
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: Ib12c5e865814f8b3c54c3e862af2191315bbc6e5