tree bcb99fe0d1ab888b8f593a1f2c15d7c717b3b1ef
parent 33a3b2cecf174cb14097498214131fcfb32ec04c
parent 0ba9380a337d5e2eae9fd9e4eb8039403ed3815b
author Andreas Huber <andih@google.com> 1323380151 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323380151 -0800

am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps