tree a039b9d76318525fcafc7ecc248b7598238b694e
parent f0734ac87eb8adaae2fe746c890d27ea6d617eb8
parent 0407e185d7ff7e46f735f9be739096daaf3625d3
author Deepanshu Gupta <deepanshu@google.com> 1417725952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417725952 +0000

am 0407e185: am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev

* commit '0407e185d7ff7e46f735f9be739096daaf3625d3':
  Add tzdata to SDK build