tree 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97
parent a54b284a2c476b49a43b80040dc8acd65f3766b7
parent 4ecb74ce01eeb258b109f5a2aa7e40f5c5e14db4
author Mathias Agopian <mathias@google.com> 1321559180 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321559180 -0800

am 2030d78d: am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1

* commit '2030d78dc9c20d2f561f4b11f1a1adddb63661c6':
  be a bit more defensive when parsing extension strings