tree b763ee0f32b989246adcd97eaf0bcabd7b601088
parent 200312ceb6315fe67979232cd46526c93e449109
parent c92cd91e886a78796457d61073c1b60372865fbd
author Jean-Baptiste Queru <jbq@google.com> 1332954793 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332954793 -0700

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

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