OSDN Git Service

Merge changes I8953967a,If17eddad into oc-dev am: b8abd8d867
authorJason Monk <jmonk@google.com>
Thu, 20 Apr 2017 18:30:04 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 18:30:04 +0000 (18:30 +0000)
commitbc4d3b3f882999c43b5f8f487888b4183d31099e
tree54fc7df4baaac43df564c05a6b6d0c5d0501d997
parent7d18bfa67b10b6059c014698bd8eb9119c938fd8
parent68da249054cdfa157cd883e07f375c60c843773d
Merge changes I8953967a,If17eddad into oc-dev am: b8abd8d867
am: 68da249054

Change-Id: I4765886cec83980a59000a077e927cb480420e3c