OSDN Git Service

am 4efa3d27: (-s ours) am 0d9cd9e9: DO NOT MERGE Fix problem that reading/writing...
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:58:48 +0000 (15:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:58:48 +0000 (15:58 +0000)
commited29fe34a9c244619ba977b6f0a18e548374c6bb
treeb11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parent4fade2334e6e624a4a1c516fde5e0dff726c0cad
parent4efa3d2783d0061c62a02e550500ec6564d36553
am 4efa3d27: (-s ours) am 0d9cd9e9: DO NOT MERGE Fix problem that reading/writing crypto footers wasn\'t identity

* commit '4efa3d2783d0061c62a02e550500ec6564d36553':
  DO NOT MERGE Fix problem that reading/writing crypto footers wasn't identity