| commit | fddc192fc3f19d43eae63b242f488fc181b29ff3 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 23:01:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 23:01:22 2014 +0000 |
| tree | 51c9a91ec0847db3b48efd33de9123e0e67df2c7 | |
| parent | 1dcb4f05dc21c5aa36d78469f74e39d1cb765b65 [diff] | |
| parent | 7b9c13b5dcac9c3e800ab2feea323a20b8bc10b2 [diff] |
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 '7b9c13b5dcac9c3e800ab2feea323a20b8bc10b2':