| commit | 8d6dee775951bf77f0b635bb3a551e02a208e1a4 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 23:13:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 23:13:07 2014 +0000 |
| tree | e359ff391e21e53cecfe487158d4301b6c140ab5 | |
| parent | db204c7992edcac02a4a8770bfcb0b906f6543e4 [diff] | |
| parent | 9605eaa78b4b757d7319184e383b662eba2c2781 [diff] |
am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs * commit '9605eaa78b4b757d7319184e383b662eba2c2781':