am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1

* commit '33fe4a36b7d1ef84b13447f2a765db465ef96e56':
  Fix TelephonyManager to grab the best context
tree: 476197e8e57e9a4d71714640cfb24601b41590e0
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE