Merge remote-tracking branch 'aosp/master' into HEAD
Gallery : Remove LOCAL_SDK_VERSION

Also remove optional tag

This is needed since we need access to private apis and 4.2's build system
stubs if you have it set to "current"

Change-Id: I1e2f985238f317fb3595962801bb9b3d2792dc5a
Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	Android.mk
Gallery: Removed "Settings" item from menu. (GallerySettings are empty)

As soon as GallerySettings.java has content, comments should be removed
from the files that this commit changes.
Menu without "Settings": http://i.imgur.com/gOX7x.png

Patchset2: Reverted AlbumSetPage.java changes

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93
Gallery: Removed "Settings" item from menu. (GallerySettings are empty)

Fixed Build Error from previous patch

Patchset2: Minor comment fix

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93

Conflicts:
	res/menu/albumset.xml
Gallery2: Localize strings

Undo and redo were hardcoded in the photo editor. This allows their
localization.

Patch Set 2: Use new strings so that it may be better translated for
certain languages. (Translations in separate patch)

Change-Id: I63df977696b74128ca5e6fc45037b6b43d43a465
Gallery2: Filtershow toast translations

Toast translation strings that were copy-pasted from existing "undo" and
"redo" strings. Some of these may need to be modified for the toast to
fit on the screen.

Patch Set 2: Shorten Dutch strings as per Marco Brohet's suggestion.

Change-Id: Iaa42ca57dfdd327ffde35a77e320d7f04605f682