am b001fa53: am 85cb45c8: Merge "Add defaults for manta" into jb-mr1-dev

* commit 'b001fa535bad8fb1ac5571dac959b52c8499fd2b':
  Add defaults for manta
main
Jason Chen 2012-08-29 15:46:36 -07:00 committed by Android Git Automerger
commit 63098b5952
2 changed files with 2 additions and 0 deletions

View File

@ -23,5 +23,6 @@
<item>herring,5</item> <item>herring,5</item>
<item>tuna,5</item> <item>tuna,5</item>
<item>mako,20</item> <item>mako,20</item>
<item>manta,16</item>
</string-array> </string-array>
</resources> </resources>

View File

@ -25,5 +25,6 @@
<item>stingray,0.4</item> <item>stingray,0.4</item>
<item>grouper,0.3</item> <item>grouper,0.3</item>
<item>mako,0.3</item> <item>mako,0.3</item>
<item>manta,0.2</item>
</string-array> </string-array>
</resources> </resources>