OSDN Git Service

Merge changes I65bc7769,Ib24c7060
authorAndreas Gampe <agampe@google.com>
Tue, 4 Oct 2016 19:12:10 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 19:12:10 +0000 (19:12 +0000)
am: d74bd3a9a4

Change-Id: Ic6e0297261b9774b3f58ed1211fa5059d0384062


Trivial merge