tree a3abd852395cfa37005367059cb9429029516103
parent b03e1176df1e66a49a5649faf6994fa9ec1a9bea
parent 87e14187111254b8842193f4f3514c0dea50967d
author Deepanshu Gupta <deepanshu@google.com> 1397673634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397673634 +0000

am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev

* commit '87e14187111254b8842193f4f3514c0dea50967d':
  Add methods for Time_Delegate [DO NOT MERGE]