tree a7f73229f49030e8eec56fc754260793eb14151e
parent d9f31612f2af69abc7b56c154e48d4ac639eeac1
parent cf4e6a722c22eb333a1520847052e54901531541
author Calin Juravle <calin@google.com> 1409156318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409156318 +0000

am cf4e6a72: am 8078df97: Merge "Make sure that ro.dalvik.vm.native.bridge is always set."

* commit 'cf4e6a722c22eb333a1520847052e54901531541':
  Make sure that ro.dalvik.vm.native.bridge is always set.