| commit | babc7880785ea22074bd58dbf5b5144dd33521d7 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:48:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:48:17 2014 +0000 |
| tree | 6e8798d3dbf579977b83d9848fb4556845892e2d | |
| parent | d67beb9aa9dfd4db1b12bcf932492acac221df04 [diff] | |
| parent | 38e59046d835fd6edb6eb333053a0c84fa4c02c9 [diff] |
am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs * commit '38e59046d835fd6edb6eb333053a0c84fa4c02c9':