commit | 079b5f05967de3f31e059d43db3ed76e89150ef8 | [log] [tgz] |
---|---|---|
author | Dake Gu <dake@google.com> | Fri May 13 17:49:41 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 13 17:49:41 2016 +0000 |
tree | e4a9fd0c4b0bce1fe1f987c3e81371c8a4f64c9a | |
parent | 5913fe0f4aa3ced92575240f78efd105e50f2eab [diff] | |
parent | 6489b522dc8e6cd4fe23e627cd903e7bde79d2dc [diff] |
Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 am: 6489b522dc * commit '6489b522dc8e6cd4fe23e627cd903e7bde79d2dc': Showcase app: added a video playing at the end of GuidedStepFragment workflow Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L. Change-Id: I605acb4bef521d6b257acc1da736e38bd606acf6