OSDN Git Service

[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into...
authorJeff Sharkey <jsharkey@android.com>
Fri, 1 Jun 2018 22:57:36 +0000 (15:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 22:57:36 +0000 (15:57 -0700)
commit8e7c2624bb47ae3746f4bc82f1d591dd399cab06
tree12a25cd983571836c1fe20d775917eb457c75a76
parente763ed2aa3075a1fd699f09c06ba67dbfd946a6b
parent2b9a343319d48e5963130542b71d0509b8ba69bd
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88
am: 2b9a343319  -s ours

Change-Id: Ibdcc6722750cfe7cb394a52d21de8e73ecdfd650