| commit | 7f295eefbe9469049579d59b5298f461aa7bbeb5 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Sat Jul 19 00:42:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 19 00:42:10 2014 +0000 |
| tree | d184480f7e32e78ca99970d7edfef52e12317410 | |
| parent | 8b8fca489858f3e519cfbe56007e9d106f1e4982 [diff] | |
| parent | 8d6dee775951bf77f0b635bb3a551e02a208e1a4 [diff] |
am 8d6dee77: 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 '8d6dee775951bf77f0b635bb3a551e02a208e1a4':