tree f0ec9769bcf30567a876534af93900770a2f7095
parent c18bdc969abb0aad272dc09d4971c1176a9ed8db
parent 0e90861ce2a8341cef65d3158dfff2952ce27e60
author James Dong <jdong@google.com> 1276028006 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276028006 -0700

Merge "Remove some hard-coded encoding parameters" into kraken