OSDN Git Service

Merge branch 'android-4.4.y' into android-4.4
authorTodd Kjos <tkjos@google.com>
Thu, 23 Feb 2017 19:37:18 +0000 (11:37 -0800)
committerTodd Kjos <tkjos@google.com>
Thu, 23 Feb 2017 19:37:18 +0000 (11:37 -0800)

Trivial merge