OSDN Git Service

Merge changes I295c7876,Ib4b84b7b
authorAndreas Gampe <agampe@google.com>
Fri, 22 Jul 2016 00:03:12 +0000 (00:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 00:03:12 +0000 (00:03 +0000)
commit7aee17199235348055deb89d07cdc8ea12adf189
tree491226b4876e8972c7a51e414e071684c64dcf0d
parent0cbcc8b07610bcd689380127abf2e404f098ddcb
parent84413a7617602c466e39de8e8897914a6d06779d
Merge changes I295c7876,Ib4b84b7b
am: 84413a7617

Change-Id: I8b32598a46cb589cdefa1937ba4b9b69926f25b9