OSDN Git Service

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into oc-dev
authorMyles Watson <mylesgw@google.com>
Thu, 31 May 2018 23:59:03 +0000 (16:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 23:59:03 +0000 (16:59 -0700)
commit6d40208ab2155d009cd6fd791e603dd508159289
tree43126d9fc34eeb709025c0480c17615bbcb19ad6
parent409b40eb84a0eacb7c07858df3886b0fe5093055
parentd1305de35acc73480e78f02ded2bc80d466fb77f
Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into oc-dev
am: d1305de35a

Change-Id: I1ee0e824ef5fdf2e434a6505bc25ab026472151e