tree 654dfb85cc538d75e3d860bb6e4f402ab5b120c6
parent 9625980058e2a2a3153a0311f2b98f20eec4f62d
parent bdae9bf2ec3bbf8e33a34caa412bd8fd7bc2d434
author Sergio Giro <sgiro@google.com> 1443725999 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443725999 +0000

am bdae9bf2: resolved conflicts for 70808827 to stage-aosp-master

* commit 'bdae9bf2ec3bbf8e33a34caa412bd8fd7bc2d434':
  system/core: remove BasicHashtable