OSDN Git Service

Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537...
authorJeff Sharkey <jsharkey@android.com>
Sat, 17 Sep 2016 00:23:53 +0000 (00:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Sep 2016 00:23:53 +0000 (00:23 +0000)
am: db901ee296

Change-Id: I683e1c33b8058a597163aacfc744df339188cd37


Trivial merge