tree fda4cd26738c9e5bbbaf005b2008c251881d5528
parent 73be3ba687db08252e8fe10dac049599d506f821
parent 21eda0c31a96068540649c310850958331c258b9
author The Android Open Source Project <initial-contribution@android.com> 1348198287 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348198287 -0700

am 21eda0c3: (-s ours) am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

* commit '21eda0c31a96068540649c310850958331c258b9':
  Remove version requirements for AOSP