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