| commit | 8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:31:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:31:44 2014 +0000 |
| tree | e9bd7ae87dd4d4baef8e93dc9df3742408799ca5 | |
| parent | 716666beaa0d8411781eebc89dc53a38155ca3dc [diff] | |
| parent | 5fff297a34f2699a64a055700da4d3411e7c7ca2 [diff] |
am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs * commit '5fff297a34f2699a64a055700da4d3411e7c7ca2': Update platform SDK component to revision 5. [DO NOT MERGE]