OSDN Git Service

resolve merge conflicts of ac9b2c4fab42 to stage-aosp-master
authorBrad Ebinger <breadley@google.com>
Thu, 23 Feb 2017 00:57:23 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Feb 2017 00:57:23 +0000 (00:57 +0000)
commit609cfc916bd72760795bac58d6ba436320e8529d
tree756328a16f9ef2e0391a5a9df911e8b04f1f1df2
parentf17c1d488840a00118be7b93be11bdae66f23189
parent4fb8988854d4a3bc8b8e442aee4a698b57283c5c
resolve merge conflicts of ac9b2c4fab42 to stage-aosp-master
am: 4fb8988854

Change-Id: Ic679f452ad245cbe58ea8069c34c15e50ee9e5c2