am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread

Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf'

* commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
  Fixed NdefTag parcelable conversion methods.
tree: c1de301e59289ee9ac3fa95516624c3c03ce507c
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE