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)
am: 84413a7617

Change-Id: I8b32598a46cb589cdefa1937ba4b9b69926f25b9


Trivial merge