OSDN Git Service

am 6db1236e: resolved conflicts for merge of e903ae3f to ub-camera-everglades
authorSpike Sprague <spikuru@google.com>
Wed, 30 Apr 2014 00:54:38 +0000 (00:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 00:54:38 +0000 (00:54 +0000)
commita6dda14e7a32e19711ede47223a24d9d715e2d5c
tree2b3972b400395701f4e726266fc91cde7bfdd176
parent43d2ac50995ae02216657f6541e610a476add460
parent6db1236ecd6b33b4fd1042570cc0d725634a5276
am 6db1236e: resolved conflicts for merge of e903ae3f to ub-camera-everglades

* commit '6db1236ecd6b33b4fd1042570cc0d725634a5276':
  fix free space calculation / querying timing problem