tree 91d0f55125b2503bcd77d74c08fd2c1b3f3b0d05
parent 5923b16f3c20c6611917ad2e589bd1aa634ccb71
parent 6350cfb529b30af88a2bff42962ab111a0cf137b
author Dirk Dougherty <ddougherty@google.com> 1354739338 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354739338 -0800

am 6350cfb5: am 6a3ad968: am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev

* commit '6350cfb529b30af88a2bff42962ab111a0cf137b':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.