tree a8b8a21035b6c977ed330022082e9098dfb0ebeb
parent fd7e2f74d2127df25b35044b48ec250b114b48d7
parent fec880df27adeb901a0e936e7bf3f944d8b95cb7
author Dirk Dougherty <nobody@android.com> 1243382373 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243382373 -0700

am 522ab34d: AI 149272: Mark 1.5r1 as a "non-current" release, with pointer to 1.5r2.   BUG=1790234

Merge commit '522ab34d3821dc760e10f4bdf3fbdb558c6a1d01' into donut

* commit '522ab34d3821dc760e10f4bdf3fbdb558c6a1d01':
  AI 149272: Mark 1.5r1 as a "non-current" release, with pointer to 1.5r2.