| commit | 9605eaa78b4b757d7319184e383b662eba2c2781 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 23:06:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 23:06:36 2014 +0000 |
| tree | b4252ddef59b53ff3f7d05e7a43217408f926d1e | |
| parent | 626baa07c8fb1b8b2c038c927c84e4942db8f9b2 [diff] | |
| parent | fddc192fc3f19d43eae63b242f488fc181b29ff3 [diff] |
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 'fddc192fc3f19d43eae63b242f488fc181b29ff3':