OSDN Git Service

Merge changes I240f8bb7,I27defaa7,Ib82d64cc
authorAndreas Gampe <agampe@google.com>
Sun, 20 Nov 2016 00:45:26 +0000 (00:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 20 Nov 2016 00:45:26 +0000 (00:45 +0000)
am: af524438b8

Change-Id: I18004b2d494439d0049bab27c3b1e17acf358fa3


Trivial merge