OSDN Git Service

Merge "Make prefs without an action unselectable" into nyc-dev
authorFyodor Kupolov <fkupolov@google.com>
Thu, 2 Jun 2016 22:49:07 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Jun 2016 22:49:07 +0000 (22:49 +0000)
am: 9121169dca

* commit '9121169dca4bf3f11908031fd72448025d3933d4':
  Make prefs without an action unselectable

Change-Id: Ia3b0efe9acd7c4ebf9213d141211f23322b8152e


Trivial merge