OSDN Git Service

Merge changes I295c7876,Ib4b84b7b am: 84413a7617
authorAndreas Gampe <agampe@google.com>
Fri, 22 Jul 2016 00:05:41 +0000 (00:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 00:05:41 +0000 (00:05 +0000)
commit3ec5be2608873f3800434f07584d3a5144edf931
tree491226b4876e8972c7a51e414e071684c64dcf0d
parent6863897ca72318c890e73018c880e80fc1e2c58c
parent7aee17199235348055deb89d07cdc8ea12adf189
Merge changes I295c7876,Ib4b84b7b am: 84413a7617
am: 7aee171992

Change-Id: Iccde165be1e432c9c3e86f03f07a1e2d45428d5f