tree a92eb2363e97370a08dfaf86712e6ea1e58d7801
parent e7b0c80ea60b505b03b5afbc4685dd1cd7a58662
parent afc23719508f1163f783cf7dd53409b03d6ef3f2
author Jean-Baptiste Queru <jbq@google.com> 1332953088 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332953088 -0700

am afc23719: organize scripts with per-version sections to avoid merge conflicts

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