commit | 925b911f53f0e1484be4232ea6a26e5696c81764 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 18:47:20 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 18:47:20 2014 +0000 |
tree | 0a5b6fdba44f8fc75759fa1dbaabff2a7654551a | |
parent | 43f1fe7e5e625f9de515220f375c18db5b5476cd [diff] | |
parent | 013af337bc804a0b491bd3f1e1cba45d61cbe2ea [diff] |
am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev * commit '013af337bc804a0b491bd3f1e1cba45d61cbe2ea': Add methods for Time_Delegate [DO NOT MERGE]