OSDN Git Service

Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 22:39:29 +0000 (15:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 22:39:29 +0000 (15:39 -0700)
commita29108a77854df6888d427cbf097bab0f7585b6d
tree2aed0bda478eed87490ff8a5380d8b68f1c3094f
parent65db9c47b984036b53665e7b9ee03b6d16e79c4f
parent438cf9da5223b1b430e4082b8b2b7f271bad81be
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
am: 438cf9da52

Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794