am 946f3ad1: resolved conflicts for merge of 2f5c6d2d to honeycomb-plus-aosp

* commit '946f3ad199e4c20606f4461751f510220b22e7b8':
  Update to tzdata2011h.