| commit | dd0fcf2f8386a7d7b1b9bb293ae689bd2489e0d9 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:38:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:38:42 2014 +0000 |
| tree | 2f939a8cc51d89ce17c9699747f776a3430b8bc1 | |
| parent | 53e1237a8edbad2de948f55b13df596853ae578f [diff] | |
| parent | 9f1005fdbe41f842708884801f9c313cf87a0cde [diff] |
am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs * commit '9f1005fdbe41f842708884801f9c313cf87a0cde':