tree 2a8c7ca1008b15a2a70cdccd97bbd3631416371f
parent a1cda0e3cfd3dd4acca13d8722d68ab701ce51f5
parent 7803fde3744305dc916b5197559da352a609d79b
author Mathieu Chartier <mathieuc@google.com> 1396045316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396045316 +0000

am 7803fde3: am baa8a1b3: am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"

* commit '7803fde3744305dc916b5197559da352a609d79b':
  Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000