OSDN Git Service

resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Tue, 10 Jan 2017 23:12:18 +0000 (15:12 -0800)
committerAndreas Gampe <agampe@google.com>
Tue, 10 Jan 2017 23:12:18 +0000 (15:12 -0800)
commitbe3a8ad2ba0eedb9d200121c97f98c3638857d22
tree7a729aff94d1efa99d1e252ea2e84ed7146cfcd9
parentcab27fbbf45e5788831db29fa6008bdb95a69899
parent53726c0bbfafea124fa683801ce6911b0dfdf64c
resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp

Change-Id: Iddf65660f9ac1d66907c8a3d2a3d34d9f3f66d81