Merge branch 'readonly-p4-master'

AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk version, dependent software libraries, gadgets
  Add new attributes for sdk version, software libs and gadgets
  BUG = 1730924
  Original author: asuchitra
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144406

Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

auto import from //depot/cupcake/@136594

auto import from //depot/cupcake/@135843

auto import from //depot/cupcake/@135843

auto import from //depot/cupcake/@132589

auto import from //depot/cupcake/@137055

auto import from //branches/cupcake/...@132569

auto import from //branches/cupcake/...@130745

Merge branch 'cupcake'

auto import from //branches/cupcake/...@127101

Merge branch 'cupcake'

auto import from //branches/cupcake/...@126645

auto import from //branches/cupcake/...@125939

auto import from //branches/cupcake/...@125939

Merge commit 'remotes/korg/cupcake'

Conflicts:
core/java/com/android/internal/app/AlertController.java
core/res/res/values/strings.xml
media/java/android/media/AudioSystem.java
services/java/com/android/server/LocationManagerService.java

Code drop from //branches/cupcake/...@124589

Fix typo. It's "picasa", not "picassa".

Initial Contribution