commit | 911ad51b052a0df9e0dde66f83d3ab55e62a3826 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 19:49:08 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:49:08 2014 +0000 |
tree | 1de886a057bff8a44a5ea254a6bcb86cb88246d8 | |
parent | 36e8b4d3cdc7cbd98af1c97f4af3e2524c4cffc2 [diff] | |
parent | 06f4c8c7315956a906d054d52ff7f27bf84db8b9 [diff] |
am 06f4c8c7: (-s ours) 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 '06f4c8c7315956a906d054d52ff7f27bf84db8b9': Add methods for Time_Delegate [DO NOT MERGE]