OSDN Git Service

am 412a5c3f: am 2f7ae925: Merge "Add support for clobbered blocks"
authorTao Bao <tbao@google.com>
Wed, 13 May 2015 20:29:37 +0000 (20:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 May 2015 20:29:37 +0000 (20:29 +0000)
* commit '412a5c3f52dafcb21fb86d6ca6bb5fd3deed90a4':
  Add support for clobbered blocks

1  2 
tools/releasetools/common.py

Simple merge