OSDN Git Service

Merge changes Ia14276d3,I7f063806
authorAndreas Gampe <agampe@google.com>
Fri, 6 Jan 2017 23:09:35 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 23:09:35 +0000 (23:09 +0000)
am: 1b2f6c36c7

Change-Id: Ib274eaefc1e46db03bca7dbe03bc6d99b30746eb


Trivial merge