OSDN Git Service

Merge changes I914dfac9,I33b1934a
authorAndreas Gampe <agampe@google.com>
Fri, 20 Jan 2017 17:09:14 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 17:09:14 +0000 (17:09 +0000)
commit6e820fe940506c14bd9e3364ca1608a636d4dfac
tree702905fde7c2f3188eb27837a58c6903b5c6de79
parentc6514e8e4d5e8e644b05ca69314fa0ecce61e8da
parent7709f7bec864120d8eb4180720ebdd16e0c99c2a
Merge changes I914dfac9,I33b1934a
am: 7709f7bec8

Change-Id: I85cd1c69a758bda81420849144d0b0fe2d7d2411