OSDN Git Service

Merge changes Ia4bec085,I59095f2a am: 733d007279
authorAndreas Gampe <agampe@google.com>
Fri, 16 Dec 2016 19:47:42 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 19:47:42 +0000 (19:47 +0000)
commit2260a6ef9a9d228375596fd817ff2de449819f4b
treeb89ee4e1e7bf4be95d90bd435659e7a03fb9b3e4
parented8757a761f26e747ffc62d28f3c477038066075
parent3d17e17b0a8df7ce1b3492b334bb10c0a4772baf
Merge changes Ia4bec085,I59095f2a am: 733d007279
am: 3d17e17b0a

Change-Id: I835f1efcf985c73db9ddb5ffe15d80842afdf6e2