| commit | f7aeafbaf0c0dab6d415e3bc6254b57e11b3be7e | [log] [tgz] |
|---|---|---|
| author | Dake Gu <dake@google.com> | Fri May 13 17:52:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 17:52:16 2016 +0000 |
| tree | 043f39b3092fadc444199c4e3f2994c1a3ab1a0e | |
| parent | 554b41bf87110aca7a4b6670f69e0748fdaf0611 [diff] | |
| parent | daba65a3b6c0b01bf5cda444f782120ac3ebd168 [diff] |
Merge "Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 am: 6489b522dc" into nyc-mr1-dev-plus-aosp am: daba65a3b6 * commit 'daba65a3b6c0b01bf5cda444f782120ac3ebd168': 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: I2b5535edc717dc2424e38fef09004b08b135fd8b