| commit | 6489b522dc8e6cd4fe23e627cd903e7bde79d2dc | [log] [tgz] |
|---|---|---|
| author | Keyvan Amiri <keyvana@google.com> | Fri May 13 17:47:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 17:47:02 2016 +0000 |
| tree | 1e0847de9fa1b68d6fe9b43a8f62372079572b62 | |
| parent | 0ba81b53e910e3e5c9f9ed86ae41870baf426ebc [diff] | |
| parent | 3a1d9d5f06913525e5dc157abb9bc1cdb6a81315 [diff] |
Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 * commit '3a1d9d5f06913525e5dc157abb9bc1cdb6a81315': 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: I884c565e8786d1aa8848a21b8f12bea056e4ea3f