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