tree cd4d6964854b5c6e8e64ea49fa71d41b05fd4c53
parent 89b566ac9fc460c0cb7d75cc0ebd6c0ec0db3e36
parent 2a544301a2454b7c5a18e8028430a6b13ded0d89
author Jean-Baptiste Queru <jbq@google.com> 1332953230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332953230 -0700

am 2a544301: am 5cd7e86d: organize scripts with per-version sections to avoid merge conflicts

* commit '2a544301a2454b7c5a18e8028430a6b13ded0d89':
  organize scripts with per-version sections to avoid merge conflicts