OSDN Git Service

am 1cabb1cf: Merge "Fix missing operation in CombineBlocks"
authorVladimir Marko <vmarko@google.com>
Tue, 12 Aug 2014 12:06:52 +0000 (12:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Aug 2014 12:06:52 +0000 (12:06 +0000)
commit0c96a60087fb0f4839bce88f091ac2bb0a2647d5
treee8c7eae2bf1307076c853cd90c966aeeac5e0277
parentc1a0d6ee3aa4916cdeb73fd81fcd5a1387031839
parent1cabb1cf03f2cf9e008abe6c19a575006d87521f
am 1cabb1cf: Merge "Fix missing operation in CombineBlocks"

* commit '1cabb1cf03f2cf9e008abe6c19a575006d87521f':
  Fix missing operation in CombineBlocks