am 45131d0c: Merge "Only reset time from NITZ in zone fix." into jb-dev

* commit '45131d0c3b9cb6927589396520eb40f33be406f0':
  Only reset time from NITZ in zone fix.
am d7e4ae48: Merge "Update AsyncTask documentation" into jb-dev

* commit 'd7e4ae48c576d5aaef75754b29a8b87c1f0d6427':
  Update AsyncTask documentation
am bfa3d50b: Merge "Doc changes for GridLayout." into jb-dev

* commit 'bfa3d50b49a93a7d02f93c9ac54a74c40c6f2046':
  Doc changes for GridLayout.
am 90497c18: Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev

* commit '90497c18f72cf3d7ea2fd611502d0da2c9c69879':
  Remotable view method for TextView.setTextSize(int, float).
am ee3bb649: Merge "Disable debug logs." into jb-dev

* commit 'ee3bb6498adc801023798b4fc48b5dcd77e059f5':
  Disable debug logs.
am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev

* commit '9c06ac09c3530c5f0bc0b47a3350eedb5b539c35':
  Merge "AAPT: support a new --ignore-assets flag."
am 2926948d: Merge "Add RemoteViews.setViewPadding()." into jb-dev

* commit '2926948d2092fcf6e38328d690dd60510fe9bf1f':
  Add RemoteViews.setViewPadding().
am 46a8b1ac: Merge "Remove unused, obsolete debug code" into jb-dev

* commit '46a8b1acdbbaa9bcbd0127b4f4580b5a8ec38119':
  Remove unused, obsolete debug code
Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"
am ab68bbaf: Merge "add flag to websearch intent" into jb-dev

* commit 'ab68bbaf26cd526f6a5b8928533356d1f0fc7886':
  add flag to websearch intent
am 1a111852: Merge "Updating default wallpaper for non-xlarge devices. (Bug 6460469)" into jb-dev

* commit '1a111852e3ea21ea25053f2e3afc50bad7bbc9e8':
  Updating default wallpaper for non-xlarge devices. (Bug 6460469)
am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"

* commit '6fd507b92746481f63922059697226c8ec6ad72b':
  stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"

* commit '64f77c5e312ff0b45a91853f782f112a99df758f':
  stagefright avcenc: Use intptr_t for casting pointers to integers
am d4cc9253: Merge "Remove DEBUG_LATENCY flag" into jb-dev

* commit 'd4cc925358305dff4ea3d0ff94b882c51f06db26':
  Remove DEBUG_LATENCY flag
am de83e7aa: Merge "Make TextView respect ACCESSIBILITY_SPEAK_PASSWORD preference." into jb-dev

* commit 'de83e7aa32e7b1a6c8aea780664150345b7ae097':
  Make TextView respect ACCESSIBILITY_SPEAK_PASSWORD preference.
am 7bce428c: (-s ours) am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"

* commit '7bce428ccc41210d9271b32f1ea94af0ef6bff7d':
  stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
am ce5b506e: (-s ours) am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"

* commit 'ce5b506ef7a9dde769056419e40c67f96cfad6a7':
  stagefright avcenc: Use intptr_t for casting pointers to integers
am af5c0118: Merge "Fix issue #6447773: Pulse does not run in JB (NPE in GestureDetector.onTouchEvent)" into jb-dev

* commit 'af5c01185bb9f76fd6cbdc87344f1d9b60ebdd8c':
  Fix issue #6447773: Pulse does not run in JB (NPE in GestureDetector.onTouchEvent)
am fca91a8e: Merge "Type of search on headset key long press must depend on device state" into jb-dev

* commit 'fca91a8e6aa7f35b2144697c6adf5934da2600b2':
  Type of search on headset key long press must depend on device state