OSDN Git Service

am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Tue, 28 Jan 2014 00:00:50 +0000 (00:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 00:00:50 +0000 (00:00 +0000)
* commit '04cff70804810d27e1fcbef556ebfdc39278d746':
  ota_from_target_files: Add an option to not sign OTA packages


Trivial merge