tree 923757c305682d3c21108473461941c9337bba9e
parent 026ec03a560b2eae7c699d060661d13ab4ec15fb
parent 0b1ca8354803a1007e491865a7335015c2d4118b
author Jean-Baptiste Queru <jbq@google.com> 1332953231 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332953231 -0700

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

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