LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of ce28e097 to master

Browse Source 
Change-Id: Iced68c2dbae177b59aa6f3862868e68836be2afd
This commit is contained in:
Dianne Hackborn
2011-06-13 17:21:25 -07:00
parent bc85db5f97 ce28e09784
commit b6d84fde9f
25 changed files with 1582 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/res/values/strings.xml
View File

@@ -153,6 +153,8 @@
<string name="first">First</string>
<string name="last">Last</string>
<string name="fragment_tabs">App/Fragment/Tabs</string>
<string name="loader_cursor">App/Loader/Cursor</string>
<string name="loader_custom">App/Loader/Custom</string>