merge heads

This commit is contained in:
Jimmy Shih
2012-04-04 16:54:29 -07:00
parent 1c0ce45937
commit c5fa717d55
14 changed files with 274 additions and 320 deletions
-4
View File
@@ -1025,10 +1025,6 @@ limitations under the License.
translation_description="In the menu, to stop recording a track.">
Stop recording
</string>
<string name="menu_tracks"
translation_description="In the menu, to show a list of all the tracks.">
Tracks
</string>
<!-- My Location -->
<string name="my_location_approximate_location"