tree c9619d455d65097ee695c4374ce135fe8f6ecc66
parent 74d290fd62dfec09708664f354805c548b3dc5eb
parent 8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc
author Ricardo Cervera <rcervera@google.com> 1391721432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391721432 +0000

am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs

* commit '8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
  docs: Updated the retaining an object during conf change. Bug: 10303533