tree b59c928b487cf4bfe9176177a662eaec047de961
parent c738e48ed6a25108cb330fb224975bb6677bc9b3
parent ce2e9d8716a0c56f7a7dae0eadbd014dd8b83b23
author Aurimas Liutikas <aurimas@google.com> 1465865838 +0000
committer android-build-merger <android-build-merger@google.com> 1465865838 +0000

Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am: 893413e50c
am: ce2e9d8716

Change-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866