tree 272b4fa8657fe153eed988e69d5253dd7e0015f7
parent e154d13b47d7a2bf5968a7c6070da15814d3c544
parent 62c54ce5b09bab16dfabf18cc1f2dc1d9b35acf8
author Andreas Huber <andih@google.com> 1323482959 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323482959 -0800

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

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