| commit | 00f09fa40d0d6d7f9ce8c8f98b1dce9501b44bec | [log] [tgz] |
|---|---|---|
| author | Keyvan Amiri <keyvana@google.com> | Fri May 13 17:47:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 17:47:01 2016 +0000 |
| tree | 5a3d21025619be2b61e9716b03ee0ad164eee512 | |
| parent | c428170e9146d921f1560dd127931254b3955474 [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: I2335daa33dde0f4d21616f2aea4525563da1c302