| commit | 8a6ed5cdf536b5b25164fb05ea7b922e1177b9a1 | [log] [tgz] |
|---|---|---|
| author | Dake Gu <dake@google.com> | Fri May 13 17:49:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 17:49:43 2016 +0000 |
| tree | e4a9fd0c4b0bce1fe1f987c3e81371c8a4f64c9a | |
| parent | 5f2d0b16b5b35ad357e8c58579da6b67ad125131 [diff] | |
| parent | 00f09fa40d0d6d7f9ce8c8f98b1dce9501b44bec [diff] |
Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 am: 00f09fa40d * commit '00f09fa40d0d6d7f9ce8c8f98b1dce9501b44bec': 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: I59ed977f191279125a896a60a3444de974f185a6