commit | 744888ed1bf52bfc85868d26252baac6b08fb77f | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jun 14 01:26:30 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 14 01:26:31 2016 +0000 |
tree | 371f92229cc58f053ca68ba2e4b0a584b06b2bfb | |
parent | 62457a7889c499ec7747e4c461790a41b2b8e51b [diff] | |
parent | abd6f9576e4dfe5a4c0b42c26a2937119974bfe9 [diff] |
Merge "Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716 am: 3f1741a19c am: 0ea3ffd6c1" into nyc-mr1-dev-plus-aosp