| commit | 84e3386eb261b45db60090c8cb8a7c8df0fa0660 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:31:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:31:29 2014 +0000 |
| tree | b66220493ec8b5b6070bce9d8106a5ec14f676e8 | |
| parent | a9078f4a2b29713e3759c2cbdba8ebe3db0639c4 [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]