am aec39e62: Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit 'aec39e625b95088f4020302a0eac1f38da43c765':
  two digit number handling in croatia and serbia
tree: fb817d03badd962bd310ce18b949ffc469c4f874
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE