tree 9e320e9d616516dd7f56782e9e2538d13d6ed088
parent d35e28f38b0c496a068ba3ce951c3e7b3fe77a52
parent 20e540be098be58f48778db33d8123ebdcfd182d
author Deepanshu Gupta <deepanshu@google.com> 1399060231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399060231 +0000

am 20e540be: am 2d7a9c3e: (-s ours) am c3e89c3f: am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]

* commit '20e540be098be58f48778db33d8123ebdcfd182d':
  Add methods for Time_Delegate [DO NOT MERGE]