OSDN Git Service

am f36ae7ca: Merge "Added support for 3GPP meta data atoms"
authorMarco Nelissen <marcone@google.com>
Mon, 19 Aug 2013 20:04:50 +0000 (13:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Aug 2013 20:04:50 +0000 (13:04 -0700)
* commit 'f36ae7ca47dff5a5266f633bb36bf92308eec3f8':
  Added support for 3GPP meta data atoms


Trivial merge