tree b803d0b56902cc80ca152c3b1311e9af0162e0e0
parent 4ae03b99750750c8467d808819322ddf402cd0d7
parent 54d97c88b57d2c341f0629c9648d4400a34e4f41
author Elliott Hughes <enh@google.com> 1373563007 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373563007 -0700

am 54d97c88: am 9da67a94: am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""

* commit '54d97c88b57d2c341f0629c9648d4400a34e4f41':
  Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."