am c7b54666: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit 'c7b54666e097fbc102ac6754da99e1513f60d5ea':
  Update to tzdata2011g.