am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '28009e8102aa91294362cc2d7770cab73d02e640':
  Import translations. DO NOT MERGE
am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
  Import translations. DO NOT MERGE
am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
  Import translations. DO NOT MERGE
am 22c66639: Merge "Fixes for 64bit in libhwui"

* commit '22c66639093a634b5688372d261d003b0478c450':
  Fixes for 64bit in libhwui
am 4a642ee5: Merge "Remove unused JNITest class"

* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
  Remove unused JNITest class
am 8d41e653: Merge "Miscellaneous small documentation fixes."

* commit '8d41e653bae240488281d430309e2d501e9524e5':
  Miscellaneous small documentation fixes.
am 4a809272: Merge "Fix documentation for Parcel.readException()."

* commit '4a80927241b3168d9d5138c46c22385d6467a736':
  Fix documentation for Parcel.readException().
am bbfc08b3: Merge changes I6d4fdada,Ia34899a4

* commit 'bbfc08b3abc0934f67659f3238eb79dcac838c17':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
Merge "add android studio to launch procedures" into klp-docs
am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs

* commit '25b44ae684295b53ac7ba15d827fc03c51aee37b':
  add android studio to launch procedures
am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs

* commit 'b26117aca0daadeb51369c8da617d5b7ba9b05b6':
  add android studio to launch procedures
Make FORCE_STOP_PACKAGES "signature|system"

Bug: 12992556
Change-Id: Iebc91aabb67034e8a5ada7efdcdaaed4cc6d0f1b
(cherry picked from commit 4b7510cf842fdadf1b7e8e0495ded1b2bbd50d7e)
DO NOT MERGE Sanitize WifiConfigs

Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

Conflicts:
	core/java/android/net/LinkProperties.java
	services/java/com/android/server/WifiService.java
	wifi/java/android/net/wifi/WifiStateMachine.java
am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"

* commit '6ab07fac49d6b618883a2ef4cea11f0959b3abe3':
  Use long for pointers in opengl/EGL classes
am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

* commit '2ba70fd49bfcbb516e75c198c106764609335feb':
  Use reinterpret_cast when an integer is cast to a pointer
Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev

* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
  UsbDeviceManager: Fix race condition entering USB accessory mode
am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev

* commit '2c7b913e367670dde337893efd59029c054019fc':
  UsbDeviceManager: Fix race condition entering USB accessory mode
am 95023066: DO NOT MERGE Sanitize WifiConfigs

* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs

* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs