summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-08-27 01:46:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 01:46:10 +0000
commit27bc97e6e14c663e5e55c6a934cc485cadbe9e33 (patch)
tree2701bf2337bd1a05df4b1c4e7cba3a27be5b4048 /tools
parenta5223697189736e413e09f49801cfbcf029c8d58 (diff)
parentf4ad2febdb6f87a08e5f8229b0f3b2d8a7dc25de (diff)
downloadbuild-27bc97e6e14c663e5e55c6a934cc485cadbe9e33.zip
build-27bc97e6e14c663e5e55c6a934cc485cadbe9e33.tar.gz
build-27bc97e6e14c663e5e55c6a934cc485cadbe9e33.tar.bz2
am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
* commit 'f4ad2febdb6f87a08e5f8229b0f3b2d8a7dc25de': Don't fail build of otatools if there are no device certificates
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions