Merge with head.

This commit is contained in:
Sandor Dornbush
2011-07-03 15:47:20 -07:00
100 changed files with 5838 additions and 4042 deletions
@@ -38,16 +38,6 @@ limitations under the License.
<item>100</item>
</string-array>
<string-array name="min_recording_distance_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>10</item>
<item>100</item>
</string-array>
<string-array name="max_recording_distance_values">
<item>50</item>
<item>100</item>