tree c40e2780b51507577ea5a9206a17d901a27df231
parent 531939d151167e56b3106205f4c3d859a9f509ce
parent 893ee42c721a948dd7d45e88f4c1e85815173205
author Ricardo Cervera <rcervera@google.com> 1391720952 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391720952 +0000

Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs