tree 513129af061f58b10b7bb8b2e288306124277c40
parent b485e5d71d448f2f621c85b94fd2894aa06fbb88
parent 28429d6055d560b9de047f6b6be278518acdafd0
author David 'Digit' Turner <digit@google.com> 1403309536 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403309536 +0000

am 28429d60: Merge "Fix emulation of old platform images."

* commit '28429d6055d560b9de047f6b6be278518acdafd0':
  Fix emulation of old platform images.