merging with master
This commit is contained in:
parent
320ac82dea
commit
4f57d3a201
17 changed files with 438 additions and 606 deletions
|
|
@ -24,7 +24,8 @@
|
|||
</activity>
|
||||
<activity
|
||||
android:name=".VideoItemDetailActivity"
|
||||
android:label="@string/title_videoitem_detail" >
|
||||
android:label="@string/title_videoitem_detail"
|
||||
android:theme="@style/AppTheme">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".VideoItemListActivity" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue