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)
commite1b3bd7ed3660da2e17029a2589f4831fe38062f
tree6729e3faee09b7ddae446e9706d64abd7e9566f4
parent76f08da2eeffbe0a796398720a6bac003c31027e
parent1b2f6c36c7aea739f048733ca93927e4b3a143c7
Merge changes Ia14276d3,I7f063806
am: 1b2f6c36c7

Change-Id: Ib274eaefc1e46db03bca7dbe03bc6d99b30746eb