am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE

* commit '464b2259c9c70b36c534e8f2380ff45130a84c66':
  Fix NPE in CatService.encodeOptionalTags.
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE