OSDN Git Service

Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537...
authorJeff Sharkey <jsharkey@android.com>
Fri, 16 Sep 2016 23:40:13 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Sep 2016 23:40:13 +0000 (23:40 +0000)
am: fc1c0f9dff

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a


Trivial merge