tree fd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a
parent a84a175390c91cd57858f4c539243481d530bfc4
parent 884f3b14c654612f922bb3927e17dfa795939594
author Deepanshu Gupta <deepanshu@google.com> 1397677474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677474 +0000

am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev

* commit '884f3b14c654612f922bb3927e17dfa795939594':
  Add methods for Time_Delegate [DO NOT MERGE]