tree 5a1454bc3d58c3d7284ad77208c704b38b9792eb
parent a5e35cb002936291b79ff422c94eb2caabedfb3a
parent 8ff1f285c93a1a44a7419ab216bee2f92518387a
author Ricardo Cervera <rcervera@google.com> 1391721820 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391721820 +0000

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

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