OSDN Git Service

Merge changes I9ad4ce81,I360d539e
authorHugo Benichi <hugobenichi@google.com>
Thu, 6 Apr 2017 02:01:07 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 02:01:07 +0000 (02:01 +0000)
am: 9680667b1d

Change-Id: I7c64e3db6a1d153339f50db292761131dbfa2ae8


Trivial merge