tree be196cd3b032cd858b80f656157dbde635af9cfe
parent 2011ecbf35884d527e1b3162a8e58dca6d1bda01
parent 2c0153539a01d63bcc04e73ab46237bec9a7868b
author Joe Fernandez <joefernandez@google.com> 1333412660 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333412660 -0700

am 2c015353: Merge "docs: SDK r18 + 4.0.4 system image Release Notes (RC1)" into ics-mr1

* commit '2c0153539a01d63bcc04e73ab46237bec9a7868b':
  docs: SDK r18 + 4.0.4 system image Release Notes (RC1)