OSDN Git Service

am d3910404: (-s ours) am fc44a515: new block OTA system tools
authorDoug Zongker <dougz@google.com>
Tue, 26 Aug 2014 22:01:36 +0000 (22:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Aug 2014 22:01:36 +0000 (22:01 +0000)
* commit 'd391040444e553ddef7b7b998230248f10162474':
  new block OTA system tools


Trivial merge