OSDN Git Service

am a7f27a76: (-s ours) am 504bb9e7: Merge "Temporarily increase saved tombstone size...
authorChristopher Ferris <cferris@google.com>
Thu, 7 May 2015 19:42:02 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 19:42:02 +0000 (19:42 +0000)
* commit 'a7f27a767347af8383c78be656fb5d809ee60951':
  Temporarily increase saved tombstone size. DO NOT MERGE


Trivial merge