OSDN Git Service

Merge "Fix NPE by pressing Volume Up/Down" am: fca5ee0bb8 am: bd57a4d8a1
authorDan Zhang <danielzhang@google.com>
Fri, 19 Jan 2018 05:13:10 +0000 (05:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Jan 2018 05:13:10 +0000 (05:13 +0000)
am: cc07fa73a1

Change-Id: I95d710489a0ad87c6e3811603097e5438f11f413


Trivial merge