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)
commit4062ac81be9d673646e49912fde1b53ed2313792
tree5c3de5cb8ec269bbdb0f423b6137819bf44666cc
parente11ed001ddb3368aaaaacdd08a0337407b6e6f2f
parent9680667b1d889f189e25b3e5e2d44bbd611c0171
Merge changes I9ad4ce81,I360d539e
am: 9680667b1d

Change-Id: I7c64e3db6a1d153339f50db292761131dbfa2ae8