tree b101b3e6b0cb55469d8e342ca47027897cf655dc
parent 3fcc20f47901623f0f23c74bd71ef24a3f484618
parent 740c9b3e91e6244bdf7e449ef3de137660957aa0
author TreeHugger Robot <treehugger-gerrit@google.com> 1506016161 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506016161 +0000

Merge "Make getLifecycle public by overriding it in FragmentActivity" into oc-mr1-dev