OSDN Git Service

am 40191799: (-s ours) am 6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace...
authorEino-Ville Talvala <etalvala@google.com>
Mon, 6 Apr 2015 23:28:16 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Apr 2015 23:28:16 +0000 (23:28 +0000)
* commit '4019179991bae66f72bae8e81c0f2399da4ee85e':
  DO NOT MERGE Cherry-pick dataSpace and BufferItem changes


Trivial merge