am 22271d0c: Merge "Upgrade bionic to tzdata2014j."

* commit '22271d0c200c8c2f7c7c960a8751eed0faa708ec':
  Upgrade bionic to tzdata2014j.
This commit is contained in:
Elliott Hughes 2014-11-12 02:35:54 +00:00 committed by Android Git Automerger
commit c25737a193

Binary file not shown.