tree f3de6b10b9c53a2562a33d16163a47e99e266303
parent 02b6de29f43a7abdbf87e72a26bf0b1e789a70e0
parent 554f66f1e840bd2accd0d35f1f73f302c637162e
author Jean-Baptiste Queru <jbq@google.com> 1348473017 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348473017 -0700

am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

* commit '554f66f1e840bd2accd0d35f1f73f302c637162e':
  Self-extractors for JRO03R binaries for maguro