tree 2de34eaf949bd30904e7e7343a64fce86fec4561
parent 51b31fd5353b0b9d2f00ef5a412d355e89f1b593
parent e85d8d66207a1abcfd954edc1d6a23bd1b0bf3b8
author John Wang <johnwang@google.com> 1297802449 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297802449 -0800

am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
  Only decode EXT1 tag when it is available.