tree f3de6b10b9c53a2562a33d16163a47e99e266303
parent 21eda0c31a96068540649c310850958331c258b9
parent a56b9f48d6204c44383220b574fa290a9aaabb1a
author Jean-Baptiste Queru <jbq@google.com> 1348265794 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348265794 -0700

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

* commit 'a56b9f48d6204c44383220b574fa290a9aaabb1a':
  Self-extractors for JRO03R binaries for maguro